iqltechnologies / brighty

brighty/wp-admin/includes/class-wp-users-list-table.php

Indentation +642 added lines, -642 removed lines

@@ -17,292 +17,292 @@ 
  */
 class WP_Users_List_Table extends WP_List_Table {
 
-	/**
-	 * Site ID to generate the Users list table for.
-	 *
-	 * @since 3.1.0
-	 * @var int
-	 */
-	public $site_id;
-
-	/**
-	 * Whether or not the current Users list table is for Multisite.
-	 *
-	 * @since 3.1.0
-	 * @var bool
-	 */
-	public $is_site_users;
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @see WP_List_Table::__construct() for more information on default arguments.
-	 *
-	 * @param array $args An associative array of arguments.
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct(
-			array(
-				'singular' => 'user',
-				'plural'   => 'users',
-				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-			)
-		);
-
-		$this->is_site_users = 'site-users-network' === $this->screen->id;
-
-		if ( $this->is_site_users ) {
-			$this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
-		}
-	}
-
-	/**
-	 * Check the current user's permissions.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return bool
-	 */
-	public function ajax_user_can() {
-		if ( $this->is_site_users ) {
-			return current_user_can( 'manage_sites' );
-		} else {
-			return current_user_can( 'list_users' );
-		}
-	}
-
-	/**
-	 * Prepare the users list for display.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global string $role
-	 * @global string $usersearch
-	 */
-	public function prepare_items() {
-		global $role, $usersearch;
-
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
-
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
-
-		$per_page       = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
-		$users_per_page = $this->get_items_per_page( $per_page );
-
-		$paged = $this->get_pagenum();
-
-		if ( 'none' === $role ) {
-			$args = array(
-				'number'  => $users_per_page,
-				'offset'  => ( $paged - 1 ) * $users_per_page,
-				'include' => wp_get_users_with_no_role( $this->site_id ),
-				'search'  => $usersearch,
-				'fields'  => 'all_with_meta',
-			);
-		} else {
-			$args = array(
-				'number' => $users_per_page,
-				'offset' => ( $paged - 1 ) * $users_per_page,
-				'role'   => $role,
-				'search' => $usersearch,
-				'fields' => 'all_with_meta',
-			);
-		}
-
-		if ( '' !== $args['search'] ) {
-			$args['search'] = '*' . $args['search'] . '*';
-		}
-
-		if ( $this->is_site_users ) {
-			$args['blog_id'] = $this->site_id;
-		}
-
-		if ( isset( $_REQUEST['orderby'] ) ) {
-			$args['orderby'] = $_REQUEST['orderby'];
-		}
-
-		if ( isset( $_REQUEST['order'] ) ) {
-			$args['order'] = $_REQUEST['order'];
-		}
-
-		/**
-		 * Filters the query arguments used to retrieve users for the current users list table.
-		 *
-		 * @since 4.4.0
-		 *
-		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
-		 *                    users list table.
-		 */
-		$args = apply_filters( 'users_list_table_query_args', $args );
-
-		// Query the user IDs for this page.
-		$wp_user_search = new WP_User_Query( $args );
-
-		$this->items = $wp_user_search->get_results();
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $wp_user_search->get_total(),
-				'per_page'    => $users_per_page,
-			)
-		);
-	}
-
-	/**
-	 * Output 'no users' message.
-	 *
-	 * @since 3.1.0
-	 */
-	public function no_items() {
-		_e( 'No users found.' );
-	}
-
-	/**
-	 * Return an associative array listing all the views that can be used
-	 * with this table.
-	 *
-	 * Provides a list of roles and user count for that role for easy
-	 * Filtersing of the user table.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global string $role
-	 *
-	 * @return string[] An array of HTML links keyed by their view.
-	 */
-	protected function get_views() {
-		global $role;
-
-		$wp_roles = wp_roles();
-
-		$count_users = ! wp_is_large_user_count();
-
-		if ( $this->is_site_users ) {
-			$url = 'site-users.php?id=' . $this->site_id;
-		} else {
-			$url = 'users.php';
-		}
-
-		$role_links              = array();
-		$avail_roles             = array();
-		$all_text                = __( 'All' );
-		$current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
-
-		if ( $count_users ) {
-			if ( $this->is_site_users ) {
-				switch_to_blog( $this->site_id );
-				$users_of_blog = count_users( 'time', $this->site_id );
-				restore_current_blog();
-			} else {
-				$users_of_blog = count_users();
-			}
-
-			$total_users = $users_of_blog['total_users'];
-			$avail_roles =& $users_of_blog['avail_roles'];
-			unset( $users_of_blog );
-
-			$all_text = sprintf(
-				/* translators: %s: Number of users. */
-				_nx(
-					'All <span class="count">(%s)</span>',
-					'All <span class="count">(%s)</span>',
-					$total_users,
-					'users'
-				),
-				number_format_i18n( $total_users )
-			);
-		}
-
-		$role_links['all'] = sprintf( '<a href="%s"%s>%s</a>', $url, $current_link_attributes, $all_text );
-
-		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( $count_users && ! isset( $avail_roles[ $this_role ] ) ) {
-				continue;
-			}
-
-			$current_link_attributes = '';
-
-			if ( $this_role === $role ) {
-				$current_link_attributes = ' class="current" aria-current="page"';
-			}
-
-			$name = translate_user_role( $name );
-			if ( $count_users ) {
-				$name = sprintf(
-					/* translators: 1: User role name, 2: Number of users. */
-					__( '%1$s <span class="count">(%2$s)</span>' ),
-					$name,
-					number_format_i18n( $avail_roles[ $this_role ] )
-				);
-			}
-
-			$role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
-		}
-
-		if ( ! empty( $avail_roles['none'] ) ) {
-
-			$current_link_attributes = '';
-
-			if ( 'none' === $role ) {
-				$current_link_attributes = ' class="current" aria-current="page"';
-			}
-
-			$name = __( 'No role' );
-			$name = sprintf(
-				/* translators: 1: User role name, 2: Number of users. */
-				__( '%1$s <span class="count">(%2$s)</span>' ),
-				$name,
-				number_format_i18n( $avail_roles['none'] )
-			);
-
-			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
-		}
-
-		return $role_links;
-	}
-
-	/**
-	 * Retrieve an associative array of bulk actions available on this table.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array Array of bulk action labels keyed by their action.
-	 */
-	protected function get_bulk_actions() {
-		$actions = array();
-
-		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) ) {
-				$actions['remove'] = __( 'Remove' );
-			}
-		} else {
-			if ( current_user_can( 'delete_users' ) ) {
-				$actions['delete'] = __( 'Delete' );
-			}
-		}
-
-		// Add a password reset link to the bulk actions dropdown.
-		if ( current_user_can( 'edit_users' ) ) {
-			$actions['resetpassword'] = __( 'Send password reset' );
-		}
-
-		return $actions;
-	}
-
-	/**
-	 * Output the controls to allow user roles to be changed in bulk.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param string $which Whether this is being invoked above ("top")
-	 *                      or below the table ("bottom").
-	 */
-	protected function extra_tablenav( $which ) {
-		$id        = 'bottom' === $which ? 'new_role2' : 'new_role';
-		$button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
-		?>
+    /**
+     * Site ID to generate the Users list table for.
+     *
+     * @since 3.1.0
+     * @var int
+     */
+    public $site_id;
+
+    /**
+     * Whether or not the current Users list table is for Multisite.
+     *
+     * @since 3.1.0
+     * @var bool
+     */
+    public $is_site_users;
+
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        parent::__construct(
+            array(
+                'singular' => 'user',
+                'plural'   => 'users',
+                'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+            )
+        );
+
+        $this->is_site_users = 'site-users-network' === $this->screen->id;
+
+        if ( $this->is_site_users ) {
+            $this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
+        }
+    }
+
+    /**
+     * Check the current user's permissions.
+     *
+     * @since 3.1.0
+     *
+     * @return bool
+     */
+    public function ajax_user_can() {
+        if ( $this->is_site_users ) {
+            return current_user_can( 'manage_sites' );
+        } else {
+            return current_user_can( 'list_users' );
+        }
+    }
+
+    /**
+     * Prepare the users list for display.
+     *
+     * @since 3.1.0
+     *
+     * @global string $role
+     * @global string $usersearch
+     */
+    public function prepare_items() {
+        global $role, $usersearch;
+
+        $usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+
+        $role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+
+        $per_page       = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
+        $users_per_page = $this->get_items_per_page( $per_page );
+
+        $paged = $this->get_pagenum();
+
+        if ( 'none' === $role ) {
+            $args = array(
+                'number'  => $users_per_page,
+                'offset'  => ( $paged - 1 ) * $users_per_page,
+                'include' => wp_get_users_with_no_role( $this->site_id ),
+                'search'  => $usersearch,
+                'fields'  => 'all_with_meta',
+            );
+        } else {
+            $args = array(
+                'number' => $users_per_page,
+                'offset' => ( $paged - 1 ) * $users_per_page,
+                'role'   => $role,
+                'search' => $usersearch,
+                'fields' => 'all_with_meta',
+            );
+        }
+
+        if ( '' !== $args['search'] ) {
+            $args['search'] = '*' . $args['search'] . '*';
+        }
+
+        if ( $this->is_site_users ) {
+            $args['blog_id'] = $this->site_id;
+        }
+
+        if ( isset( $_REQUEST['orderby'] ) ) {
+            $args['orderby'] = $_REQUEST['orderby'];
+        }
+
+        if ( isset( $_REQUEST['order'] ) ) {
+            $args['order'] = $_REQUEST['order'];
+        }
+
+        /**
+         * Filters the query arguments used to retrieve users for the current users list table.
+         *
+         * @since 4.4.0
+         *
+         * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
+         *                    users list table.
+         */
+        $args = apply_filters( 'users_list_table_query_args', $args );
+
+        // Query the user IDs for this page.
+        $wp_user_search = new WP_User_Query( $args );
+
+        $this->items = $wp_user_search->get_results();
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $wp_user_search->get_total(),
+                'per_page'    => $users_per_page,
+            )
+        );
+    }
+
+    /**
+     * Output 'no users' message.
+     *
+     * @since 3.1.0
+     */
+    public function no_items() {
+        _e( 'No users found.' );
+    }
+
+    /**
+     * Return an associative array listing all the views that can be used
+     * with this table.
+     *
+     * Provides a list of roles and user count for that role for easy
+     * Filtersing of the user table.
+     *
+     * @since 3.1.0
+     *
+     * @global string $role
+     *
+     * @return string[] An array of HTML links keyed by their view.
+     */
+    protected function get_views() {
+        global $role;
+
+        $wp_roles = wp_roles();
+
+        $count_users = ! wp_is_large_user_count();
+
+        if ( $this->is_site_users ) {
+            $url = 'site-users.php?id=' . $this->site_id;
+        } else {
+            $url = 'users.php';
+        }
+
+        $role_links              = array();
+        $avail_roles             = array();
+        $all_text                = __( 'All' );
+        $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
+
+        if ( $count_users ) {
+            if ( $this->is_site_users ) {
+                switch_to_blog( $this->site_id );
+                $users_of_blog = count_users( 'time', $this->site_id );
+                restore_current_blog();
+            } else {
+                $users_of_blog = count_users();
+            }
+
+            $total_users = $users_of_blog['total_users'];
+            $avail_roles =& $users_of_blog['avail_roles'];
+            unset( $users_of_blog );
+
+            $all_text = sprintf(
+                /* translators: %s: Number of users. */
+                _nx(
+                    'All <span class="count">(%s)</span>',
+                    'All <span class="count">(%s)</span>',
+                    $total_users,
+                    'users'
+                ),
+                number_format_i18n( $total_users )
+            );
+        }
+
+        $role_links['all'] = sprintf( '<a href="%s"%s>%s</a>', $url, $current_link_attributes, $all_text );
+
+        foreach ( $wp_roles->get_names() as $this_role => $name ) {
+            if ( $count_users && ! isset( $avail_roles[ $this_role ] ) ) {
+                continue;
+            }
+
+            $current_link_attributes = '';
+
+            if ( $this_role === $role ) {
+                $current_link_attributes = ' class="current" aria-current="page"';
+            }
+
+            $name = translate_user_role( $name );
+            if ( $count_users ) {
+                $name = sprintf(
+                    /* translators: 1: User role name, 2: Number of users. */
+                    __( '%1$s <span class="count">(%2$s)</span>' ),
+                    $name,
+                    number_format_i18n( $avail_roles[ $this_role ] )
+                );
+            }
+
+            $role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
+        }
+
+        if ( ! empty( $avail_roles['none'] ) ) {
+
+            $current_link_attributes = '';
+
+            if ( 'none' === $role ) {
+                $current_link_attributes = ' class="current" aria-current="page"';
+            }
+
+            $name = __( 'No role' );
+            $name = sprintf(
+                /* translators: 1: User role name, 2: Number of users. */
+                __( '%1$s <span class="count">(%2$s)</span>' ),
+                $name,
+                number_format_i18n( $avail_roles['none'] )
+            );
+
+            $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
+        }
+
+        return $role_links;
+    }
+
+    /**
+     * Retrieve an associative array of bulk actions available on this table.
+     *
+     * @since 3.1.0
+     *
+     * @return array Array of bulk action labels keyed by their action.
+     */
+    protected function get_bulk_actions() {
+        $actions = array();
+
+        if ( is_multisite() ) {
+            if ( current_user_can( 'remove_users' ) ) {
+                $actions['remove'] = __( 'Remove' );
+            }
+        } else {
+            if ( current_user_can( 'delete_users' ) ) {
+                $actions['delete'] = __( 'Delete' );
+            }
+        }
+
+        // Add a password reset link to the bulk actions dropdown.
+        if ( current_user_can( 'edit_users' ) ) {
+            $actions['resetpassword'] = __( 'Send password reset' );
+        }
+
+        return $actions;
+    }
+
+    /**
+     * Output the controls to allow user roles to be changed in bulk.
+     *
+     * @since 3.1.0
+     *
+     * @param string $which Whether this is being invoked above ("top")
+     *                      or below the table ("bottom").
+     */
+    protected function extra_tablenav( $which ) {
+        $id        = 'bottom' === $which ? 'new_role2' : 'new_role';
+        $button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
+        ?>
 	<div class="alignleft actions">
 		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
 		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to&hellip;' ); ?></label>
@@ -312,363 +312,363 @@ 
 			<option value="none"><?php _e( '&mdash; No role for this site &mdash;' ); ?></option>
 		</select>
 			<?php
-			submit_button( __( 'Change' ), '', $button_id, false );
-		endif;
-
-		/**
-		 * Fires just before the closing div containing the bulk role-change controls
-		 * in the Users list table.
-		 *
-		 * @since 3.5.0
-		 * @since 4.6.0 The `$which` parameter was added.
-		 *
-		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
-		 */
-		do_action( 'restrict_manage_users', $which );
-		?>
+            submit_button( __( 'Change' ), '', $button_id, false );
+        endif;
+
+        /**
+         * Fires just before the closing div containing the bulk role-change controls
+         * in the Users list table.
+         *
+         * @since 3.5.0
+         * @since 4.6.0 The `$which` parameter was added.
+         *
+         * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+         */
+        do_action( 'restrict_manage_users', $which );
+        ?>
 		</div>
 		<?php
-		/**
-		 * Fires immediately following the closing "actions" div in the tablenav for the users
-		 * list table.
-		 *
-		 * @since 4.9.0
-		 *
-		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
-		 */
-		do_action( 'manage_users_extra_tablenav', $which );
-	}
-
-	/**
-	 * Capture the bulk action required, and return it.
-	 *
-	 * Overridden from the base class implementation to capture
-	 * the role change drop-down.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return string The bulk action required.
-	 */
-	public function current_action() {
-		if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
-			return 'promote';
-		}
-
-		return parent::current_action();
-	}
-
-	/**
-	 * Get a list of columns for the list table.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return string[] Array of column titles keyed by their column name.
-	 */
-	public function get_columns() {
-		$c = array(
-			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'Email' ),
-			'role'     => __( 'Role' ),
-			'posts'    => _x( 'Posts', 'post type general name' ),
-		);
-
-		if ( $this->is_site_users ) {
-			unset( $c['posts'] );
-		}
-
-		return $c;
-	}
-
-	/**
-	 * Get a list of sortable columns for the list table.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array Array of sortable columns.
-	 */
-	protected function get_sortable_columns() {
-		$c = array(
-			'username' => 'login',
-			'email'    => 'email',
-		);
-
-		return $c;
-	}
-
-	/**
-	 * Generate the list table rows.
-	 *
-	 * @since 3.1.0
-	 */
-	public function display_rows() {
-		// Query the post counts for this page.
-		if ( ! $this->is_site_users ) {
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
-		}
-
-		foreach ( $this->items as $userid => $user_object ) {
-			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
-		}
-	}
-
-	/**
-	 * Generate HTML for a single row on the users.php admin panel.
-	 *
-	 * @since 3.1.0
-	 * @since 4.2.0 The `$style` parameter was deprecated.
-	 * @since 4.4.0 The `$role` parameter was deprecated.
-	 *
-	 * @param WP_User $user_object The current user object.
-	 * @param string  $style       Deprecated. Not used.
-	 * @param string  $role        Deprecated. Not used.
-	 * @param int     $numposts    Optional. Post count to display for this user. Defaults
-	 *                             to zero, as in, a new user has made zero posts.
-	 * @return string Output for a single row.
-	 */
-	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
-		}
-		$user_object->filter = 'display';
-		$email               = $user_object->user_email;
-
-		if ( $this->is_site_users ) {
-			$url = "site-users.php?id={$this->site_id}&amp;";
-		} else {
-			$url = 'users.php?';
-		}
-
-		$user_roles = $this->get_role_list( $user_object );
-
-		// Set up the hover actions for this user.
-		$actions     = array();
-		$checkbox    = '';
-		$super_admin = '';
-
-		if ( is_multisite() && current_user_can( 'manage_network_users' ) ) {
-			if ( in_array( $user_object->user_login, get_super_admins(), true ) ) {
-				$super_admin = ' &mdash; ' . __( 'Super Admin' );
-			}
-		}
-
-		// Check if the user for this row is editable.
-		if ( current_user_can( 'list_users' ) ) {
-			// Set up the user editing link.
-			$edit_link = esc_url(
-				add_query_arg(
-					'wp_http_referer',
-					urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-					get_edit_user_link( $user_object->ID )
-				)
-			);
-
-			if ( current_user_can( 'edit_user', $user_object->ID ) ) {
-				$edit            = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
-				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-			} else {
-				$edit = "<strong>{$user_object->user_login}{$super_admin}</strong><br />";
-			}
-
-			if ( ! is_multisite()
-				&& get_current_user_id() !== $user_object->ID
-				&& current_user_can( 'delete_user', $user_object->ID )
-			) {
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . '</a>';
-			}
-
-			if ( is_multisite()
-				&& current_user_can( 'remove_user', $user_object->ID )
-			) {
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . '</a>';
-			}
-
-			// Add a link to the user's author archive, if not empty.
-			$author_posts_url = get_author_posts_url( $user_object->ID );
-			if ( $author_posts_url ) {
-				$actions['view'] = sprintf(
-					'<a href="%s" aria-label="%s">%s</a>',
-					esc_url( $author_posts_url ),
-					/* translators: %s: Author's display name. */
-					esc_attr( sprintf( __( 'View posts by %s' ), $user_object->display_name ) ),
-					__( 'View' )
-				);
-			}
-
-			// Add a link to send the user a reset password link by email.
-			if ( get_current_user_id() !== $user_object->ID
-				&& current_user_can( 'edit_user', $user_object->ID )
-			) {
-				$actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url( "users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Send password reset' ) . '</a>';
-			}
-
-			/**
-			 * Filters the action links displayed under each user in the Users list table.
-			 *
-			 * @since 2.8.0
-			 *
-			 * @param string[] $actions     An array of action links to be displayed.
-			 *                              Default 'Edit', 'Delete' for single site, and
-			 *                              'Edit', 'Remove' for Multisite.
-			 * @param WP_User  $user_object WP_User object for the currently listed user.
-			 */
-			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
-
-			// Role classes.
-			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
-
-			// Set up the checkbox (because the user is editable, otherwise it's empty).
-			$checkbox = sprintf(
-				'<label class="screen-reader-text" for="user_%1$s">%2$s</label>' .
-				'<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',
-				$user_object->ID,
-				/* translators: %s: User login. */
-				sprintf( __( 'Select %s' ), $user_object->user_login ),
-				$role_classes
-			);
-
-		} else {
-			$edit = "<strong>{$user_object->user_login}{$super_admin}</strong>";
-		}
-
-		$avatar = get_avatar( $user_object->ID, 32 );
-
-		// Comma-separated list of user roles.
-		$roles_list = implode( ', ', $user_roles );
-
-		$r = "<tr id='user-$user_object->ID'>";
-
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
-
-		foreach ( $columns as $column_name => $column_display_name ) {
-			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
-				$classes .= ' has-row-actions column-primary';
-			}
-			if ( 'posts' === $column_name ) {
-				$classes .= ' num'; // Special case for that column.
-			}
-
-			if ( in_array( $column_name, $hidden, true ) ) {
-				$classes .= ' hidden';
-			}
-
-			$data = 'data-colname="' . esc_attr( wp_strip_all_tags( $column_display_name ) ) . '"';
-
-			$attributes = "class='$classes' $data";
-
-			if ( 'cb' === $column_name ) {
-				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
-			} else {
-				$r .= "<td $attributes>";
-				switch ( $column_name ) {
-					case 'username':
-						$r .= "$avatar $edit";
-						break;
-					case 'name':
-						if ( $user_object->first_name && $user_object->last_name ) {
-							$r .= "$user_object->first_name $user_object->last_name";
-						} elseif ( $user_object->first_name ) {
-							$r .= $user_object->first_name;
-						} elseif ( $user_object->last_name ) {
-							$r .= $user_object->last_name;
-						} else {
-							$r .= sprintf(
-								'<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
-								_x( 'Unknown', 'name' )
-							);
-						}
-						break;
-					case 'email':
-						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
-						break;
-					case 'role':
-						$r .= esc_html( $roles_list );
-						break;
-					case 'posts':
-						if ( $numposts > 0 ) {
-							$r .= sprintf(
-								'<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-								"edit.php?author={$user_object->ID}",
-								$numposts,
-								sprintf(
-									/* translators: %s: Number of posts. */
-									_n( '%s post by this author', '%s posts by this author', $numposts ),
-									number_format_i18n( $numposts )
-								)
-							);
-						} else {
-							$r .= 0;
-						}
-						break;
-					default:
-						/**
-						 * Filters the display output of custom columns in the Users list table.
-						 *
-						 * @since 2.8.0
-						 *
-						 * @param string $output      Custom column output. Default empty.
-						 * @param string $column_name Column name.
-						 * @param int    $user_id     ID of the currently-listed user.
-						 */
-						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
-				}
-
-				if ( $primary === $column_name ) {
-					$r .= $this->row_actions( $actions );
-				}
-				$r .= '</td>';
-			}
-		}
-		$r .= '</tr>';
-
-		return $r;
-	}
-
-	/**
-	 * Gets the name of the default primary column.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @return string Name of the default primary column, in this case, 'username'.
-	 */
-	protected function get_default_primary_column_name() {
-		return 'username';
-	}
-
-	/**
-	 * Returns an array of translated user role names for a given user object.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param WP_User $user_object The WP_User object.
-	 * @return string[] An array of user role names keyed by role.
-	 */
-	protected function get_role_list( $user_object ) {
-		$wp_roles = wp_roles();
-
-		$role_list = array();
-
-		foreach ( $user_object->roles as $role ) {
-			if ( isset( $wp_roles->role_names[ $role ] ) ) {
-				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
-			}
-		}
-
-		if ( empty( $role_list ) ) {
-			$role_list['none'] = _x( 'None', 'no user roles' );
-		}
-
-		/**
-		 * Filters the returned array of translated role names for a user.
-		 *
-		 * @since 4.4.0
-		 *
-		 * @param string[] $role_list   An array of translated user role names keyed by role.
-		 * @param WP_User  $user_object A WP_User object.
-		 */
-		return apply_filters( 'get_role_list', $role_list, $user_object );
-	}
+        /**
+         * Fires immediately following the closing "actions" div in the tablenav for the users
+         * list table.
+         *
+         * @since 4.9.0
+         *
+         * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+         */
+        do_action( 'manage_users_extra_tablenav', $which );
+    }
+
+    /**
+     * Capture the bulk action required, and return it.
+     *
+     * Overridden from the base class implementation to capture
+     * the role change drop-down.
+     *
+     * @since 3.1.0
+     *
+     * @return string The bulk action required.
+     */
+    public function current_action() {
+        if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
+            return 'promote';
+        }
+
+        return parent::current_action();
+    }
+
+    /**
+     * Get a list of columns for the list table.
+     *
+     * @since 3.1.0
+     *
+     * @return string[] Array of column titles keyed by their column name.
+     */
+    public function get_columns() {
+        $c = array(
+            'cb'       => '<input type="checkbox" />',
+            'username' => __( 'Username' ),
+            'name'     => __( 'Name' ),
+            'email'    => __( 'Email' ),
+            'role'     => __( 'Role' ),
+            'posts'    => _x( 'Posts', 'post type general name' ),
+        );
+
+        if ( $this->is_site_users ) {
+            unset( $c['posts'] );
+        }
+
+        return $c;
+    }
+
+    /**
+     * Get a list of sortable columns for the list table.
+     *
+     * @since 3.1.0
+     *
+     * @return array Array of sortable columns.
+     */
+    protected function get_sortable_columns() {
+        $c = array(
+            'username' => 'login',
+            'email'    => 'email',
+        );
+
+        return $c;
+    }
+
+    /**
+     * Generate the list table rows.
+     *
+     * @since 3.1.0
+     */
+    public function display_rows() {
+        // Query the post counts for this page.
+        if ( ! $this->is_site_users ) {
+            $post_counts = count_many_users_posts( array_keys( $this->items ) );
+        }
+
+        foreach ( $this->items as $userid => $user_object ) {
+            echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+        }
+    }
+
+    /**
+     * Generate HTML for a single row on the users.php admin panel.
+     *
+     * @since 3.1.0
+     * @since 4.2.0 The `$style` parameter was deprecated.
+     * @since 4.4.0 The `$role` parameter was deprecated.
+     *
+     * @param WP_User $user_object The current user object.
+     * @param string  $style       Deprecated. Not used.
+     * @param string  $role        Deprecated. Not used.
+     * @param int     $numposts    Optional. Post count to display for this user. Defaults
+     *                             to zero, as in, a new user has made zero posts.
+     * @return string Output for a single row.
+     */
+    public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
+        if ( ! ( $user_object instanceof WP_User ) ) {
+            $user_object = get_userdata( (int) $user_object );
+        }
+        $user_object->filter = 'display';
+        $email               = $user_object->user_email;
+
+        if ( $this->is_site_users ) {
+            $url = "site-users.php?id={$this->site_id}&amp;";
+        } else {
+            $url = 'users.php?';
+        }
+
+        $user_roles = $this->get_role_list( $user_object );
+
+        // Set up the hover actions for this user.
+        $actions     = array();
+        $checkbox    = '';
+        $super_admin = '';
+
+        if ( is_multisite() && current_user_can( 'manage_network_users' ) ) {
+            if ( in_array( $user_object->user_login, get_super_admins(), true ) ) {
+                $super_admin = ' &mdash; ' . __( 'Super Admin' );
+            }
+        }
+
+        // Check if the user for this row is editable.
+        if ( current_user_can( 'list_users' ) ) {
+            // Set up the user editing link.
+            $edit_link = esc_url(
+                add_query_arg(
+                    'wp_http_referer',
+                    urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+                    get_edit_user_link( $user_object->ID )
+                )
+            );
+
+            if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+                $edit            = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
+                $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+            } else {
+                $edit = "<strong>{$user_object->user_login}{$super_admin}</strong><br />";
+            }
+
+            if ( ! is_multisite()
+                && get_current_user_id() !== $user_object->ID
+                && current_user_can( 'delete_user', $user_object->ID )
+            ) {
+                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . '</a>';
+            }
+
+            if ( is_multisite()
+                && current_user_can( 'remove_user', $user_object->ID )
+            ) {
+                $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . '</a>';
+            }
+
+            // Add a link to the user's author archive, if not empty.
+            $author_posts_url = get_author_posts_url( $user_object->ID );
+            if ( $author_posts_url ) {
+                $actions['view'] = sprintf(
+                    '<a href="%s" aria-label="%s">%s</a>',
+                    esc_url( $author_posts_url ),
+                    /* translators: %s: Author's display name. */
+                    esc_attr( sprintf( __( 'View posts by %s' ), $user_object->display_name ) ),
+                    __( 'View' )
+                );
+            }
+
+            // Add a link to send the user a reset password link by email.
+            if ( get_current_user_id() !== $user_object->ID
+                && current_user_can( 'edit_user', $user_object->ID )
+            ) {
+                $actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url( "users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Send password reset' ) . '</a>';
+            }
+
+            /**
+             * Filters the action links displayed under each user in the Users list table.
+             *
+             * @since 2.8.0
+             *
+             * @param string[] $actions     An array of action links to be displayed.
+             *                              Default 'Edit', 'Delete' for single site, and
+             *                              'Edit', 'Remove' for Multisite.
+             * @param WP_User  $user_object WP_User object for the currently listed user.
+             */
+            $actions = apply_filters( 'user_row_actions', $actions, $user_object );
+
+            // Role classes.
+            $role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+
+            // Set up the checkbox (because the user is editable, otherwise it's empty).
+            $checkbox = sprintf(
+                '<label class="screen-reader-text" for="user_%1$s">%2$s</label>' .
+                '<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',
+                $user_object->ID,
+                /* translators: %s: User login. */
+                sprintf( __( 'Select %s' ), $user_object->user_login ),
+                $role_classes
+            );
+
+        } else {
+            $edit = "<strong>{$user_object->user_login}{$super_admin}</strong>";
+        }
+
+        $avatar = get_avatar( $user_object->ID, 32 );
+
+        // Comma-separated list of user roles.
+        $roles_list = implode( ', ', $user_roles );
+
+        $r = "<tr id='user-$user_object->ID'>";
+
+        list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+
+        foreach ( $columns as $column_name => $column_display_name ) {
+            $classes = "$column_name column-$column_name";
+            if ( $primary === $column_name ) {
+                $classes .= ' has-row-actions column-primary';
+            }
+            if ( 'posts' === $column_name ) {
+                $classes .= ' num'; // Special case for that column.
+            }
+
+            if ( in_array( $column_name, $hidden, true ) ) {
+                $classes .= ' hidden';
+            }
+
+            $data = 'data-colname="' . esc_attr( wp_strip_all_tags( $column_display_name ) ) . '"';
+
+            $attributes = "class='$classes' $data";
+
+            if ( 'cb' === $column_name ) {
+                $r .= "<th scope='row' class='check-column'>$checkbox</th>";
+            } else {
+                $r .= "<td $attributes>";
+                switch ( $column_name ) {
+                    case 'username':
+                        $r .= "$avatar $edit";
+                        break;
+                    case 'name':
+                        if ( $user_object->first_name && $user_object->last_name ) {
+                            $r .= "$user_object->first_name $user_object->last_name";
+                        } elseif ( $user_object->first_name ) {
+                            $r .= $user_object->first_name;
+                        } elseif ( $user_object->last_name ) {
+                            $r .= $user_object->last_name;
+                        } else {
+                            $r .= sprintf(
+                                '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
+                                _x( 'Unknown', 'name' )
+                            );
+                        }
+                        break;
+                    case 'email':
+                        $r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+                        break;
+                    case 'role':
+                        $r .= esc_html( $roles_list );
+                        break;
+                    case 'posts':
+                        if ( $numposts > 0 ) {
+                            $r .= sprintf(
+                                '<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+                                "edit.php?author={$user_object->ID}",
+                                $numposts,
+                                sprintf(
+                                    /* translators: %s: Number of posts. */
+                                    _n( '%s post by this author', '%s posts by this author', $numposts ),
+                                    number_format_i18n( $numposts )
+                                )
+                            );
+                        } else {
+                            $r .= 0;
+                        }
+                        break;
+                    default:
+                        /**
+                         * Filters the display output of custom columns in the Users list table.
+                         *
+                         * @since 2.8.0
+                         *
+                         * @param string $output      Custom column output. Default empty.
+                         * @param string $column_name Column name.
+                         * @param int    $user_id     ID of the currently-listed user.
+                         */
+                        $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+                }
+
+                if ( $primary === $column_name ) {
+                    $r .= $this->row_actions( $actions );
+                }
+                $r .= '</td>';
+            }
+        }
+        $r .= '</tr>';
+
+        return $r;
+    }
+
+    /**
+     * Gets the name of the default primary column.
+     *
+     * @since 4.3.0
+     *
+     * @return string Name of the default primary column, in this case, 'username'.
+     */
+    protected function get_default_primary_column_name() {
+        return 'username';
+    }
+
+    /**
+     * Returns an array of translated user role names for a given user object.
+     *
+     * @since 4.4.0
+     *
+     * @param WP_User $user_object The WP_User object.
+     * @return string[] An array of user role names keyed by role.
+     */
+    protected function get_role_list( $user_object ) {
+        $wp_roles = wp_roles();
+
+        $role_list = array();
+
+        foreach ( $user_object->roles as $role ) {
+            if ( isset( $wp_roles->role_names[ $role ] ) ) {
+                $role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+            }
+        }
+
+        if ( empty( $role_list ) ) {
+            $role_list['none'] = _x( 'None', 'no user roles' );
+        }
+
+        /**
+         * Filters the returned array of translated role names for a user.
+         *
+         * @since 4.4.0
+         *
+         * @param string[] $role_list   An array of translated user role names keyed by role.
+         * @param WP_User  $user_object A WP_User object.
+         */
+        return apply_filters( 'get_role_list', $role_list, $user_object );
+    }
 
 }

Spacing +134 added lines, -134 removed lines

@@ -42,19 +42,19 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		parent::__construct(
 			array(
 				'singular' => 'user',
 				'plural'   => 'users',
-				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen'   => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users ) {
-			$this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
+		if ($this->is_site_users) {
+			$this->site_id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 		}
 	}
 
@@ -66,10 +66,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users ) {
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_users) {
+			return current_user_can('manage_sites');
 		} else {
-			return current_user_can( 'list_users' );
+			return current_user_can('list_users');
 		}
 	}
 
@@ -84,46 +84,46 @@ 
 	public function prepare_items() {
 		global $role, $usersearch;
 
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$usersearch = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+		$role = isset($_REQUEST['role']) ? $_REQUEST['role'] : '';
 
-		$per_page       = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
-		$users_per_page = $this->get_items_per_page( $per_page );
+		$per_page       = ($this->is_site_users) ? 'site_users_network_per_page' : 'users_per_page';
+		$users_per_page = $this->get_items_per_page($per_page);
 
 		$paged = $this->get_pagenum();
 
-		if ( 'none' === $role ) {
+		if ('none' === $role) {
 			$args = array(
 				'number'  => $users_per_page,
-				'offset'  => ( $paged - 1 ) * $users_per_page,
-				'include' => wp_get_users_with_no_role( $this->site_id ),
+				'offset'  => ($paged - 1) * $users_per_page,
+				'include' => wp_get_users_with_no_role($this->site_id),
 				'search'  => $usersearch,
 				'fields'  => 'all_with_meta',
 			);
 		} else {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged - 1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'role'   => $role,
 				'search' => $usersearch,
 				'fields' => 'all_with_meta',
 			);
 		}
 
-		if ( '' !== $args['search'] ) {
+		if ('' !== $args['search']) {
 			$args['search'] = '*' . $args['search'] . '*';
 		}
 
-		if ( $this->is_site_users ) {
+		if ($this->is_site_users) {
 			$args['blog_id'] = $this->site_id;
 		}
 
-		if ( isset( $_REQUEST['orderby'] ) ) {
+		if (isset($_REQUEST['orderby'])) {
 			$args['orderby'] = $_REQUEST['orderby'];
 		}
 
-		if ( isset( $_REQUEST['order'] ) ) {
+		if (isset($_REQUEST['order'])) {
 			$args['order'] = $_REQUEST['order'];
 		}
 
@@ -135,10 +135,10 @@ 
 		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
 		 *                    users list table.
 		 */
-		$args = apply_filters( 'users_list_table_query_args', $args );
+		$args = apply_filters('users_list_table_query_args', $args);
 
 		// Query the user IDs for this page.
-		$wp_user_search = new WP_User_Query( $args );
+		$wp_user_search = new WP_User_Query($args);
 
 		$this->items = $wp_user_search->get_results();
 
@@ -156,7 +156,7 @@ 
 	 * @since 3.1.0
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -177,9 +177,9 @@ 
 
 		$wp_roles = wp_roles();
 
-		$count_users = ! wp_is_large_user_count();
+		$count_users = !wp_is_large_user_count();
 
-		if ( $this->is_site_users ) {
+		if ($this->is_site_users) {
 			$url = 'site-users.php?id=' . $this->site_id;
 		} else {
 			$url = 'users.php';
@@ -187,21 +187,21 @@ 
 
 		$role_links              = array();
 		$avail_roles             = array();
-		$all_text                = __( 'All' );
-		$current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
+		$all_text                = __('All');
+		$current_link_attributes = empty($role) ? ' class="current" aria-current="page"' : '';
 
-		if ( $count_users ) {
-			if ( $this->is_site_users ) {
-				switch_to_blog( $this->site_id );
-				$users_of_blog = count_users( 'time', $this->site_id );
+		if ($count_users) {
+			if ($this->is_site_users) {
+				switch_to_blog($this->site_id);
+				$users_of_blog = count_users('time', $this->site_id);
 				restore_current_blog();
 			} else {
 				$users_of_blog = count_users();
 			}
 
 			$total_users = $users_of_blog['total_users'];
-			$avail_roles =& $users_of_blog['avail_roles'];
-			unset( $users_of_blog );
+			$avail_roles = & $users_of_blog['avail_roles'];
+			unset($users_of_blog);
 
 			$all_text = sprintf(
 				/* translators: %s: Number of users. */
@@ -211,53 +211,53 @@ 
 					$total_users,
 					'users'
 				),
-				number_format_i18n( $total_users )
+				number_format_i18n($total_users)
 			);
 		}
 
-		$role_links['all'] = sprintf( '<a href="%s"%s>%s</a>', $url, $current_link_attributes, $all_text );
+		$role_links['all'] = sprintf('<a href="%s"%s>%s</a>', $url, $current_link_attributes, $all_text);
 
-		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( $count_users && ! isset( $avail_roles[ $this_role ] ) ) {
+		foreach ($wp_roles->get_names() as $this_role => $name) {
+			if ($count_users && !isset($avail_roles[$this_role])) {
 				continue;
 			}
 
 			$current_link_attributes = '';
 
-			if ( $this_role === $role ) {
+			if ($this_role === $role) {
 				$current_link_attributes = ' class="current" aria-current="page"';
 			}
 
-			$name = translate_user_role( $name );
-			if ( $count_users ) {
+			$name = translate_user_role($name);
+			if ($count_users) {
 				$name = sprintf(
 					/* translators: 1: User role name, 2: Number of users. */
-					__( '%1$s <span class="count">(%2$s)</span>' ),
+					__('%1$s <span class="count">(%2$s)</span>'),
 					$name,
-					number_format_i18n( $avail_roles[ $this_role ] )
+					number_format_i18n($avail_roles[$this_role])
 				);
 			}
 
-			$role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
+			$role_links[$this_role] = "<a href='" . esc_url(add_query_arg('role', $this_role, $url)) . "'$current_link_attributes>$name</a>";
 		}
 
-		if ( ! empty( $avail_roles['none'] ) ) {
+		if (!empty($avail_roles['none'])) {
 
 			$current_link_attributes = '';
 
-			if ( 'none' === $role ) {
+			if ('none' === $role) {
 				$current_link_attributes = ' class="current" aria-current="page"';
 			}
 
-			$name = __( 'No role' );
+			$name = __('No role');
 			$name = sprintf(
 				/* translators: 1: User role name, 2: Number of users. */
-				__( '%1$s <span class="count">(%2$s)</span>' ),
+				__('%1$s <span class="count">(%2$s)</span>'),
 				$name,
-				number_format_i18n( $avail_roles['none'] )
+				number_format_i18n($avail_roles['none'])
 			);
 
-			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
+			$role_links['none'] = "<a href='" . esc_url(add_query_arg('role', 'none', $url)) . "'$current_link_attributes>$name</a>";
 		}
 
 		return $role_links;
@@ -273,19 +273,19 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) ) {
-				$actions['remove'] = __( 'Remove' );
+		if (is_multisite()) {
+			if (current_user_can('remove_users')) {
+				$actions['remove'] = __('Remove');
 			}
 		} else {
-			if ( current_user_can( 'delete_users' ) ) {
-				$actions['delete'] = __( 'Delete' );
+			if (current_user_can('delete_users')) {
+				$actions['delete'] = __('Delete');
 			}
 		}
 
 		// Add a password reset link to the bulk actions dropdown.
-		if ( current_user_can( 'edit_users' ) ) {
-			$actions['resetpassword'] = __( 'Send password reset' );
+		if (current_user_can('edit_users')) {
+			$actions['resetpassword'] = __('Send password reset');
 		}
 
 		return $actions;
@@ -299,20 +299,20 @@ 
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		$id        = 'bottom' === $which ? 'new_role2' : 'new_role';
 		$button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
 		?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
-		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to&hellip;' ); ?></label>
+		<?php if (current_user_can('promote_users') && $this->has_items()) : ?>
+		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e('Change role to&hellip;'); ?></label>
 		<select name="<?php echo $id; ?>" id="<?php echo $id; ?>">
-			<option value=""><?php _e( 'Change role to&hellip;' ); ?></option>
+			<option value=""><?php _e('Change role to&hellip;'); ?></option>
 			<?php wp_dropdown_roles(); ?>
-			<option value="none"><?php _e( '&mdash; No role for this site &mdash;' ); ?></option>
+			<option value="none"><?php _e('&mdash; No role for this site &mdash;'); ?></option>
 		</select>
 			<?php
-			submit_button( __( 'Change' ), '', $button_id, false );
+			submit_button(__('Change'), '', $button_id, false);
 		endif;
 
 		/**
@@ -324,7 +324,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'restrict_manage_users', $which );
+		do_action('restrict_manage_users', $which);
 		?>
 		</div>
 		<?php
@@ -336,7 +336,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_users_extra_tablenav', $which );
+		do_action('manage_users_extra_tablenav', $which);
 	}
 
 	/**
@@ -350,7 +350,7 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
+		if (isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role'])) {
 			return 'promote';
 		}
 
@@ -367,15 +367,15 @@ 
 	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'Email' ),
-			'role'     => __( 'Role' ),
-			'posts'    => _x( 'Posts', 'post type general name' ),
+			'username' => __('Username'),
+			'name'     => __('Name'),
+			'email'    => __('Email'),
+			'role'     => __('Role'),
+			'posts'    => _x('Posts', 'post type general name'),
 		);
 
-		if ( $this->is_site_users ) {
-			unset( $c['posts'] );
+		if ($this->is_site_users) {
+			unset($c['posts']);
 		}
 
 		return $c;
@@ -404,12 +404,12 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page.
-		if ( ! $this->is_site_users ) {
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if (!$this->is_site_users) {
+			$post_counts = count_many_users_posts(array_keys($this->items));
 		}
 
-		foreach ( $this->items as $userid => $user_object ) {
-			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+		foreach ($this->items as $userid => $user_object) {
+			echo "\n\t" . $this->single_row($user_object, '', '', isset($post_counts) ? $post_counts[$userid] : 0);
 		}
 	}
 
@@ -427,80 +427,80 @@ 
 	 *                             to zero, as in, a new user has made zero posts.
 	 * @return string Output for a single row.
 	 */
-	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
+	public function single_row($user_object, $style = '', $role = '', $numposts = 0) {
+		if (!($user_object instanceof WP_User)) {
+			$user_object = get_userdata((int) $user_object);
 		}
 		$user_object->filter = 'display';
 		$email               = $user_object->user_email;
 
-		if ( $this->is_site_users ) {
+		if ($this->is_site_users) {
 			$url = "site-users.php?id={$this->site_id}&amp;";
 		} else {
 			$url = 'users.php?';
 		}
 
-		$user_roles = $this->get_role_list( $user_object );
+		$user_roles = $this->get_role_list($user_object);
 
 		// Set up the hover actions for this user.
 		$actions     = array();
 		$checkbox    = '';
 		$super_admin = '';
 
-		if ( is_multisite() && current_user_can( 'manage_network_users' ) ) {
-			if ( in_array( $user_object->user_login, get_super_admins(), true ) ) {
-				$super_admin = ' &mdash; ' . __( 'Super Admin' );
+		if (is_multisite() && current_user_can('manage_network_users')) {
+			if (in_array($user_object->user_login, get_super_admins(), true)) {
+				$super_admin = ' &mdash; ' . __('Super Admin');
 			}
 		}
 
 		// Check if the user for this row is editable.
-		if ( current_user_can( 'list_users' ) ) {
+		if (current_user_can('list_users')) {
 			// Set up the user editing link.
 			$edit_link = esc_url(
 				add_query_arg(
 					'wp_http_referer',
-					urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-					get_edit_user_link( $user_object->ID )
+					urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+					get_edit_user_link($user_object->ID)
 				)
 			);
 
-			if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+			if (current_user_can('edit_user', $user_object->ID)) {
 				$edit            = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
-				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
 			} else {
 				$edit = "<strong>{$user_object->user_login}{$super_admin}</strong><br />";
 			}
 
-			if ( ! is_multisite()
+			if (!is_multisite()
 				&& get_current_user_id() !== $user_object->ID
-				&& current_user_can( 'delete_user', $user_object->ID )
+				&& current_user_can('delete_user', $user_object->ID)
 			) {
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . '</a>';
+				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . '</a>';
 			}
 
-			if ( is_multisite()
-				&& current_user_can( 'remove_user', $user_object->ID )
+			if (is_multisite()
+				&& current_user_can('remove_user', $user_object->ID)
 			) {
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . '</a>';
+				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url($url . "action=remove&amp;user=$user_object->ID", 'bulk-users') . "'>" . __('Remove') . '</a>';
 			}
 
 			// Add a link to the user's author archive, if not empty.
-			$author_posts_url = get_author_posts_url( $user_object->ID );
-			if ( $author_posts_url ) {
+			$author_posts_url = get_author_posts_url($user_object->ID);
+			if ($author_posts_url) {
 				$actions['view'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					esc_url( $author_posts_url ),
+					esc_url($author_posts_url),
 					/* translators: %s: Author's display name. */
-					esc_attr( sprintf( __( 'View posts by %s' ), $user_object->display_name ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View posts by %s'), $user_object->display_name)),
+					__('View')
 				);
 			}
 
 			// Add a link to send the user a reset password link by email.
-			if ( get_current_user_id() !== $user_object->ID
-				&& current_user_can( 'edit_user', $user_object->ID )
+			if (get_current_user_id() !== $user_object->ID
+				&& current_user_can('edit_user', $user_object->ID)
 			) {
-				$actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url( "users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Send password reset' ) . '</a>';
+				$actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url("users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users') . "'>" . __('Send password reset') . '</a>';
 			}
 
 			/**
@@ -513,10 +513,10 @@ 
 			 *                              'Edit', 'Remove' for Multisite.
 			 * @param WP_User  $user_object WP_User object for the currently listed user.
 			 */
-			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
+			$actions = apply_filters('user_row_actions', $actions, $user_object);
 
 			// Role classes.
-			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+			$role_classes = esc_attr(implode(' ', array_keys($user_roles)));
 
 			// Set up the checkbox (because the user is editable, otherwise it's empty).
 			$checkbox = sprintf(
@@ -524,7 +524,7 @@ 
 				'<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',
 				$user_object->ID,
 				/* translators: %s: User login. */
-				sprintf( __( 'Select %s' ), $user_object->user_login ),
+				sprintf(__('Select %s'), $user_object->user_login),
 				$role_classes
 			);
 
@@ -532,70 +532,70 @@ 
 			$edit = "<strong>{$user_object->user_login}{$super_admin}</strong>";
 		}
 
-		$avatar = get_avatar( $user_object->ID, 32 );
+		$avatar = get_avatar($user_object->ID, 32);
 
 		// Comma-separated list of user roles.
-		$roles_list = implode( ', ', $user_roles );
+		$roles_list = implode(', ', $user_roles);
 
 		$r = "<tr id='user-$user_object->ID'>";
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
-			if ( 'posts' === $column_name ) {
+			if ('posts' === $column_name) {
 				$classes .= ' num'; // Special case for that column.
 			}
 
-			if ( in_array( $column_name, $hidden, true ) ) {
+			if (in_array($column_name, $hidden, true)) {
 				$classes .= ' hidden';
 			}
 
-			$data = 'data-colname="' . esc_attr( wp_strip_all_tags( $column_display_name ) ) . '"';
+			$data = 'data-colname="' . esc_attr(wp_strip_all_tags($column_display_name)) . '"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
 			} else {
 				$r .= "<td $attributes>";
-				switch ( $column_name ) {
+				switch ($column_name) {
 					case 'username':
 						$r .= "$avatar $edit";
 						break;
 					case 'name':
-						if ( $user_object->first_name && $user_object->last_name ) {
+						if ($user_object->first_name && $user_object->last_name) {
 							$r .= "$user_object->first_name $user_object->last_name";
-						} elseif ( $user_object->first_name ) {
+						} elseif ($user_object->first_name) {
 							$r .= $user_object->first_name;
-						} elseif ( $user_object->last_name ) {
+						} elseif ($user_object->last_name) {
 							$r .= $user_object->last_name;
 						} else {
 							$r .= sprintf(
 								'<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
-								_x( 'Unknown', 'name' )
+								_x('Unknown', 'name')
 							);
 						}
 						break;
 					case 'email':
-						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+						$r .= "<a href='" . esc_url("mailto:$email") . "'>$email</a>";
 						break;
 					case 'role':
-						$r .= esc_html( $roles_list );
+						$r .= esc_html($roles_list);
 						break;
 					case 'posts':
-						if ( $numposts > 0 ) {
+						if ($numposts > 0) {
 							$r .= sprintf(
 								'<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 								"edit.php?author={$user_object->ID}",
 								$numposts,
 								sprintf(
 									/* translators: %s: Number of posts. */
-									_n( '%s post by this author', '%s posts by this author', $numposts ),
-									number_format_i18n( $numposts )
+									_n('%s post by this author', '%s posts by this author', $numposts),
+									number_format_i18n($numposts)
 								)
 							);
 						} else {
@@ -612,11 +612,11 @@ 
 						 * @param string $column_name Column name.
 						 * @param int    $user_id     ID of the currently-listed user.
 						 */
-						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+						$r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
 				}
 
-				if ( $primary === $column_name ) {
-					$r .= $this->row_actions( $actions );
+				if ($primary === $column_name) {
+					$r .= $this->row_actions($actions);
 				}
 				$r .= '</td>';
 			}
@@ -645,19 +645,19 @@ 
 	 * @param WP_User $user_object The WP_User object.
 	 * @return string[] An array of user role names keyed by role.
 	 */
-	protected function get_role_list( $user_object ) {
+	protected function get_role_list($user_object) {
 		$wp_roles = wp_roles();
 
 		$role_list = array();
 
-		foreach ( $user_object->roles as $role ) {
-			if ( isset( $wp_roles->role_names[ $role ] ) ) {
-				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+		foreach ($user_object->roles as $role) {
+			if (isset($wp_roles->role_names[$role])) {
+				$role_list[$role] = translate_user_role($wp_roles->role_names[$role]);
 			}
 		}
 
-		if ( empty( $role_list ) ) {
-			$role_list['none'] = _x( 'None', 'no user roles' );
+		if (empty($role_list)) {
+			$role_list['none'] = _x('None', 'no user roles');
 		}
 
 		/**
@@ -668,7 +668,7 @@ 
 		 * @param string[] $role_list   An array of translated user role names keyed by role.
 		 * @param WP_User  $user_object A WP_User object.
 		 */
-		return apply_filters( 'get_role_list', $role_list, $user_object );
+		return apply_filters('get_role_list', $role_list, $user_object);
 	}
 
 }

brighty/wp-admin/includes/credits.php

Indentation +89 added lines, -89 removed lines

@@ -18,46 +18,46 @@ 
  * @return array|false A list of all of the contributors, or false on error.
  */
 function wp_credits( $version = '', $locale = '' ) {
-	if ( ! $version ) {
-		// Include an unmodified $wp_version.
-		require ABSPATH . WPINC . '/version.php';
+    if ( ! $version ) {
+        // Include an unmodified $wp_version.
+        require ABSPATH . WPINC . '/version.php';
 
-		$version = $wp_version;
-	}
+        $version = $wp_version;
+    }
 
-	if ( ! $locale ) {
-		$locale = get_user_locale();
-	}
+    if ( ! $locale ) {
+        $locale = get_user_locale();
+    }
 
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
+    $results = get_site_transient( 'wordpress_credits_' . $locale );
 
-	if ( ! is_array( $results )
-		|| false !== strpos( $version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $version, $results['data']['version'] ) !== 0 )
-	) {
-		$url     = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
-		$options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );
+    if ( ! is_array( $results )
+        || false !== strpos( $version, '-' )
+        || ( isset( $results['data']['version'] ) && strpos( $version, $results['data']['version'] ) !== 0 )
+    ) {
+        $url     = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
+        $options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );
 
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
-		}
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
 
-		$response = wp_remote_get( $url, $options );
+        $response = wp_remote_get( $url, $options );
 
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-			return false;
-		}
+        if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+            return false;
+        }
 
-		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+        $results = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $results ) ) {
-			return false;
-		}
+        if ( ! is_array( $results ) ) {
+            return false;
+        }
 
-		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
-	}
+        set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+    }
 
-	return $results;
+    return $results;
 }
 
 /**
@@ -71,7 +71,7 @@ 
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
 function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+    $display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
 }
 
 /**
@@ -83,7 +83,7 @@ 
  * @param string $data External library data (passed by reference).
  */
 function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+    $data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
 }
 
 /**
@@ -94,24 +94,24 @@ 
  * @param array $group_data The current contributor group.
  */
 function wp_credits_section_title( $group_data = array() ) {
-	if ( ! count( $group_data ) ) {
-		return;
-	}
-
-	if ( $group_data['name'] ) {
-		if ( 'Translators' === $group_data['name'] ) {
-			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
-		} else {
-			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$title = translate( $group_data['name'] );
-		}
-
-		echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n";
-	}
+    if ( ! count( $group_data ) ) {
+        return;
+    }
+
+    if ( $group_data['name'] ) {
+        if ( 'Translators' === $group_data['name'] ) {
+            // Considered a special slug in the API response. (Also, will never be returned for en_US.)
+            $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
+        } elseif ( isset( $group_data['placeholders'] ) ) {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+            $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+        } else {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+            $title = translate( $group_data['name'] );
+        }
+
+        echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n";
+    }
 }
 
 /**
@@ -123,44 +123,44 @@ 
  * @param string $slug    The current group to display.
  */
 function wp_credits_section_list( $credits = array(), $slug = '' ) {
-	$group_data   = isset( $credits['groups'][ $slug ] ) ? $credits['groups'][ $slug ] : array();
-	$credits_data = $credits['data'];
-	if ( ! count( $group_data ) ) {
-		return;
-	}
-
-	if ( ! empty( $group_data['shuffle'] ) ) {
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
-	}
-
-	switch ( $group_data['type'] ) {
-		case 'list':
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
-			break;
-		case 'libraries':
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
-			break;
-		default:
-			$compact = 'compact' === $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits_data['profiles'], $person_data[2] ) ) . '" class="web">';
-				$size   = $compact ? 80 : 160;
-				$data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) );
-				echo '<span class="wp-person-avatar"><img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" /></span>' . "\n";
-				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact && ! empty( $person_data[3] ) ) {
-					// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
-				}
-				echo "</li>\n";
-			}
-			echo "</ul>\n";
-			break;
-	}
+    $group_data   = isset( $credits['groups'][ $slug ] ) ? $credits['groups'][ $slug ] : array();
+    $credits_data = $credits['data'];
+    if ( ! count( $group_data ) ) {
+        return;
+    }
+
+    if ( ! empty( $group_data['shuffle'] ) ) {
+        shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+    }
+
+    switch ( $group_data['type'] ) {
+        case 'list':
+            array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles'] );
+            echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+            break;
+        case 'libraries':
+            array_walk( $group_data['data'], '_wp_credits_build_object_link' );
+            echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+            break;
+        default:
+            $compact = 'compact' === $group_data['type'];
+            $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
+            echo '<ul class="' . $classes . '" id="wp-people-group-' . $slug . '">' . "\n";
+            foreach ( $group_data['data'] as $person_data ) {
+                echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
+                echo '<a href="' . esc_url( sprintf( $credits_data['profiles'], $person_data[2] ) ) . '" class="web">';
+                $size   = $compact ? 80 : 160;
+                $data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+                $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) );
+                echo '<span class="wp-person-avatar"><img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" /></span>' . "\n";
+                echo esc_html( $person_data[0] ) . "</a>\n\t";
+                if ( ! $compact && ! empty( $person_data[3] ) ) {
+                    // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+                    echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+                }
+                echo "</li>\n";
+            }
+            echo "</ul>\n";
+            break;
+    }
 }

Spacing +48 added lines, -48 removed lines

@@ -17,44 +17,44 @@ 
  * @param string $locale  WordPress locale. Defaults to the current user's locale.
  * @return array|false A list of all of the contributors, or false on error.
  */
-function wp_credits( $version = '', $locale = '' ) {
-	if ( ! $version ) {
+function wp_credits($version = '', $locale = '') {
+	if (!$version) {
 		// Include an unmodified $wp_version.
 		require ABSPATH . WPINC . '/version.php';
 
 		$version = $wp_version;
 	}
 
-	if ( ! $locale ) {
+	if (!$locale) {
 		$locale = get_user_locale();
 	}
 
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
+	$results = get_site_transient('wordpress_credits_' . $locale);
 
-	if ( ! is_array( $results )
-		|| false !== strpos( $version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $version, $results['data']['version'] ) !== 0 )
+	if (!is_array($results)
+		|| false !== strpos($version, '-')
+		|| (isset($results['data']['version']) && strpos($version, $results['data']['version']) !== 0)
 	) {
 		$url     = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
-		$options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );
+		$options = array('user-agent' => 'WordPress/' . $version . '; ' . home_url('/'));
 
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
+		if (wp_http_supports(array('ssl'))) {
+			$url = set_url_scheme($url, 'https');
 		}
 
-		$response = wp_remote_get( $url, $options );
+		$response = wp_remote_get($url, $options);
 
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
 			return false;
 		}
 
-		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+		$results = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $results ) ) {
+		if (!is_array($results)) {
 			return false;
 		}
 
-		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+		set_site_transient('wordpress_credits_' . $locale, $results, DAY_IN_SECONDS);
 	}
 
 	return $results;
@@ -70,8 +70,8 @@ 
  * @param string $username      The contributor's username.
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
-function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+function _wp_credits_add_profile_link(&$display_name, $username, $profiles) {
+	$display_name = '<a href="' . esc_url(sprintf($profiles, $username)) . '">' . esc_html($display_name) . '</a>';
 }
 
 /**
@@ -82,8 +82,8 @@ 
  *
  * @param string $data External library data (passed by reference).
  */
-function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+function _wp_credits_build_object_link(&$data) {
+	$data = '<a href="' . esc_url($data[1]) . '">' . esc_html($data[0]) . '</a>';
 }
 
 /**
@@ -93,24 +93,24 @@ 
  *
  * @param array $group_data The current contributor group.
  */
-function wp_credits_section_title( $group_data = array() ) {
-	if ( ! count( $group_data ) ) {
+function wp_credits_section_title($group_data = array()) {
+	if (!count($group_data)) {
 		return;
 	}
 
-	if ( $group_data['name'] ) {
-		if ( 'Translators' === $group_data['name'] ) {
+	if ($group_data['name']) {
+		if ('Translators' === $group_data['name']) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
+			$title = _x('Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section');
+		} elseif (isset($group_data['placeholders'])) {
 			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+			$title = vsprintf(translate($group_data['name']), $group_data['placeholders']);
 		} else {
 			// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-			$title = translate( $group_data['name'] );
+			$title = translate($group_data['name']);
 		}
 
-		echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n";
+		echo '<h2 class="wp-people-group-title">' . esc_html($title) . "</h2>\n";
 	}
 }
 
@@ -122,41 +122,41 @@ 
  * @param array  $credits The credits groups returned from the API.
  * @param string $slug    The current group to display.
  */
-function wp_credits_section_list( $credits = array(), $slug = '' ) {
-	$group_data   = isset( $credits['groups'][ $slug ] ) ? $credits['groups'][ $slug ] : array();
+function wp_credits_section_list($credits = array(), $slug = '') {
+	$group_data   = isset($credits['groups'][$slug]) ? $credits['groups'][$slug] : array();
 	$credits_data = $credits['data'];
-	if ( ! count( $group_data ) ) {
+	if (!count($group_data)) {
 		return;
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) ) {
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if (!empty($group_data['shuffle'])) {
+		shuffle($group_data['data']); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 	}
 
-	switch ( $group_data['type'] ) {
+	switch ($group_data['type']) {
 		case 'list':
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles']);
+			echo '<p class="wp-credits-list">' . wp_sprintf('%l.', $group_data['data']) . "</p>\n\n";
 			break;
 		case 'libraries':
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_build_object_link');
+			echo '<p class="wp-credits-list">' . wp_sprintf('%l.', $group_data['data']) . "</p>\n\n";
 			break;
 		default:
 			$compact = 'compact' === $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
+			$classes = 'wp-people-group ' . ($compact ? 'compact' : '');
 			echo '<ul class="' . $classes . '" id="wp-people-group-' . $slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits_data['profiles'], $person_data[2] ) ) . '" class="web">';
+			foreach ($group_data['data'] as $person_data) {
+				echo '<li class="wp-person" id="wp-person-' . esc_attr($person_data[2]) . '">' . "\n\t";
+				echo '<a href="' . esc_url(sprintf($credits_data['profiles'], $person_data[2])) . '" class="web">';
 				$size   = $compact ? 80 : 160;
-				$data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) );
-				echo '<span class="wp-person-avatar"><img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" /></span>' . "\n";
-				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact && ! empty( $person_data[3] ) ) {
+				$data   = get_avatar_data($person_data[1] . '@md5.gravatar.com', array('size' => $size));
+				$data2x = get_avatar_data($person_data[1] . '@md5.gravatar.com', array('size' => $size * 2));
+				echo '<span class="wp-person-avatar"><img src="' . esc_url($data['url']) . '" srcset="' . esc_url($data2x['url']) . ' 2x" class="gravatar" alt="" /></span>' . "\n";
+				echo esc_html($person_data[0]) . "</a>\n\t";
+				if (!$compact && !empty($person_data[3])) {
 					// phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+					echo '<span class="title">' . translate($person_data[3]) . "</span>\n";
 				}
 				echo "</li>\n";
 			}

brighty/wp-admin/includes/class-bulk-upgrader-skin.php

Indentation +162 added lines, -162 removed lines

@@ -16,166 +16,166 @@
  * @see WP_Upgrader_Skin
  */
 class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
-	public $in_loop = false;
-	/**
-	 * @var string|false
-	 */
-	public $error = false;
-
-	/**
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		$defaults = array(
-			'url'   => '',
-			'nonce' => '',
-		);
-		$args     = wp_parse_args( $args, $defaults );
-
-		parent::__construct( $args );
-	}
-
-	/**
-	 */
-	public function add_strings() {
-		$this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
-		/* translators: 1: Title of an update, 2: Error message. */
-		$this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
-		/* translators: %s: Title of an update. */
-		$this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
-		/* translators: %s: Title of an update. */
-		$this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
-		$this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
-	}
-
-	/**
-	 * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support.
-	 *
-	 * @param string $feedback Message data.
-	 * @param mixed  ...$args  Optional text replacements.
-	 */
-	public function feedback( $feedback, ...$args ) {
-		if ( isset( $this->upgrader->strings[ $feedback ] ) ) {
-			$feedback = $this->upgrader->strings[ $feedback ];
-		}
-
-		if ( strpos( $feedback, '%' ) !== false ) {
-			if ( $args ) {
-				$args     = array_map( 'strip_tags', $args );
-				$args     = array_map( 'esc_html', $args );
-				$feedback = vsprintf( $feedback, $args );
-			}
-		}
-		if ( empty( $feedback ) ) {
-			return;
-		}
-		if ( $this->in_loop ) {
-			echo "$feedback<br />\n";
-		} else {
-			echo "<p>$feedback</p>\n";
-		}
-	}
-
-	/**
-	 */
-	public function header() {
-		// Nothing, This will be displayed within a iframe.
-	}
-
-	/**
-	 */
-	public function footer() {
-		// Nothing, This will be displayed within a iframe.
-	}
-
-	/**
-	 * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
-	 *
-	 * @param string|WP_Error $errors Errors.
-	 */
-	public function error( $errors ) {
-		if ( is_string( $errors ) && isset( $this->upgrader->strings[ $errors ] ) ) {
-			$this->error = $this->upgrader->strings[ $errors ];
-		}
-
-		if ( is_wp_error( $errors ) ) {
-			$messages = array();
-			foreach ( $errors->get_error_messages() as $emessage ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $errors->get_error_data() ) );
-				} else {
-					$messages[] = $emessage;
-				}
-			}
-			$this->error = implode( ', ', $messages );
-		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
-	}
-
-	/**
-	 */
-	public function bulk_header() {
-		$this->feedback( 'skin_upgrade_start' );
-	}
-
-	/**
-	 */
-	public function bulk_footer() {
-		$this->feedback( 'skin_upgrade_end' );
-	}
-
-	/**
-	 * @param string $title
-	 */
-	public function before( $title = '' ) {
-		$this->in_loop = true;
-		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
-		// This progress messages div gets moved via JavaScript when clicking on "Show details.".
-		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
-		$this->flush_output();
-	}
-
-	/**
-	 * @param string $title
-	 */
-	public function after( $title = '' ) {
-		echo '</p></div>';
-		if ( $this->error || ! $this->result ) {
-			if ( $this->error ) {
-				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
-			} else {
-				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
-			}
-
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
-		}
-		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error ) {
-				echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
-					'<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
-					' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
-					'</p></div>';
-			}
-
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
-		}
-
-		$this->reset();
-		$this->flush_output();
-	}
-
-	/**
-	 */
-	public function reset() {
-		$this->in_loop = false;
-		$this->error   = false;
-	}
-
-	/**
-	 */
-	public function flush_output() {
-		wp_ob_end_flush_all();
-		flush();
-	}
+    public $in_loop = false;
+    /**
+     * @var string|false
+     */
+    public $error = false;
+
+    /**
+     * @param array $args
+     */
+    public function __construct( $args = array() ) {
+        $defaults = array(
+            'url'   => '',
+            'nonce' => '',
+        );
+        $args     = wp_parse_args( $args, $defaults );
+
+        parent::__construct( $args );
+    }
+
+    /**
+     */
+    public function add_strings() {
+        $this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
+        /* translators: 1: Title of an update, 2: Error message. */
+        $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
+        /* translators: %s: Title of an update. */
+        $this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
+        /* translators: %s: Title of an update. */
+        $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
+        $this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
+    }
+
+    /**
+     * @since 5.9.0 Renamed `$string` (a PHP reserved keyword) to `$feedback` for PHP 8 named parameter support.
+     *
+     * @param string $feedback Message data.
+     * @param mixed  ...$args  Optional text replacements.
+     */
+    public function feedback( $feedback, ...$args ) {
+        if ( isset( $this->upgrader->strings[ $feedback ] ) ) {
+            $feedback = $this->upgrader->strings[ $feedback ];
+        }
+
+        if ( strpos( $feedback, '%' ) !== false ) {
+            if ( $args ) {
+                $args     = array_map( 'strip_tags', $args );
+                $args     = array_map( 'esc_html', $args );
+                $feedback = vsprintf( $feedback, $args );
+            }
+        }
+        if ( empty( $feedback ) ) {
+            return;
+        }
+        if ( $this->in_loop ) {
+            echo "$feedback<br />\n";
+        } else {
+            echo "<p>$feedback</p>\n";
+        }
+    }
+
+    /**
+     */
+    public function header() {
+        // Nothing, This will be displayed within a iframe.
+    }
+
+    /**
+     */
+    public function footer() {
+        // Nothing, This will be displayed within a iframe.
+    }
+
+    /**
+     * @since 5.9.0 Renamed `$error` to `$errors` for PHP 8 named parameter support.
+     *
+     * @param string|WP_Error $errors Errors.
+     */
+    public function error( $errors ) {
+        if ( is_string( $errors ) && isset( $this->upgrader->strings[ $errors ] ) ) {
+            $this->error = $this->upgrader->strings[ $errors ];
+        }
+
+        if ( is_wp_error( $errors ) ) {
+            $messages = array();
+            foreach ( $errors->get_error_messages() as $emessage ) {
+                if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+                    $messages[] = $emessage . ' ' . esc_html( strip_tags( $errors->get_error_data() ) );
+                } else {
+                    $messages[] = $emessage;
+                }
+            }
+            $this->error = implode( ', ', $messages );
+        }
+        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+    }
+
+    /**
+     */
+    public function bulk_header() {
+        $this->feedback( 'skin_upgrade_start' );
+    }
+
+    /**
+     */
+    public function bulk_footer() {
+        $this->feedback( 'skin_upgrade_end' );
+    }
+
+    /**
+     * @param string $title
+     */
+    public function before( $title = '' ) {
+        $this->in_loop = true;
+        printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
+        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
+        // This progress messages div gets moved via JavaScript when clicking on "Show details.".
+        echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
+        $this->flush_output();
+    }
+
+    /**
+     * @param string $title
+     */
+    public function after( $title = '' ) {
+        echo '</p></div>';
+        if ( $this->error || ! $this->result ) {
+            if ( $this->error ) {
+                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+            } else {
+                echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
+            }
+
+            echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
+        }
+        if ( $this->result && ! is_wp_error( $this->result ) ) {
+            if ( ! $this->error ) {
+                echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
+                    '<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
+                    ' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
+                    '</p></div>';
+            }
+
+            echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+        }
+
+        $this->reset();
+        $this->flush_output();
+    }
+
+    /**
+     */
+    public function reset() {
+        $this->in_loop = false;
+        $this->error   = false;
+    }
+
+    /**
+     */
+    public function flush_output() {
+        wp_ob_end_flush_all();
+        flush();
+    }
 }

Spacing +45 added lines, -45 removed lines

@@ -25,27 +25,27 @@ 
 	/**
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$defaults = array(
 			'url'   => '',
 			'nonce' => '',
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
 	 */
 	public function add_strings() {
-		$this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
+		$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
 		/* translators: 1: Title of an update, 2: Error message. */
-		$this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
+		$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
 		/* translators: %s: Title of an update. */
-		$this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
+		$this->upgrader->strings['skin_update_failed'] = __('The update of %s failed.');
 		/* translators: %s: Title of an update. */
-		$this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
-		$this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
+		$this->upgrader->strings['skin_update_successful'] = __('%s updated successfully.');
+		$this->upgrader->strings['skin_upgrade_end']       = __('All updates have been completed.');
 	}
 
 	/**
@@ -54,22 +54,22 @@ 
 	 * @param string $feedback Message data.
 	 * @param mixed  ...$args  Optional text replacements.
 	 */
-	public function feedback( $feedback, ...$args ) {
-		if ( isset( $this->upgrader->strings[ $feedback ] ) ) {
-			$feedback = $this->upgrader->strings[ $feedback ];
+	public function feedback($feedback, ...$args) {
+		if (isset($this->upgrader->strings[$feedback])) {
+			$feedback = $this->upgrader->strings[$feedback];
 		}
 
-		if ( strpos( $feedback, '%' ) !== false ) {
-			if ( $args ) {
-				$args     = array_map( 'strip_tags', $args );
-				$args     = array_map( 'esc_html', $args );
-				$feedback = vsprintf( $feedback, $args );
+		if (strpos($feedback, '%') !== false) {
+			if ($args) {
+				$args     = array_map('strip_tags', $args);
+				$args     = array_map('esc_html', $args);
+				$feedback = vsprintf($feedback, $args);
 			}
 		}
-		if ( empty( $feedback ) ) {
+		if (empty($feedback)) {
 			return;
 		}
-		if ( $this->in_loop ) {
+		if ($this->in_loop) {
 			echo "$feedback<br />\n";
 		} else {
 			echo "<p>$feedback</p>\n";
@@ -93,72 +93,72 @@ 
 	 *
 	 * @param string|WP_Error $errors Errors.
 	 */
-	public function error( $errors ) {
-		if ( is_string( $errors ) && isset( $this->upgrader->strings[ $errors ] ) ) {
-			$this->error = $this->upgrader->strings[ $errors ];
+	public function error($errors) {
+		if (is_string($errors) && isset($this->upgrader->strings[$errors])) {
+			$this->error = $this->upgrader->strings[$errors];
 		}
 
-		if ( is_wp_error( $errors ) ) {
+		if (is_wp_error($errors)) {
 			$messages = array();
-			foreach ( $errors->get_error_messages() as $emessage ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $errors->get_error_data() ) );
+			foreach ($errors->get_error_messages() as $emessage) {
+				if ($errors->get_error_data() && is_string($errors->get_error_data())) {
+					$messages[] = $emessage . ' ' . esc_html(strip_tags($errors->get_error_data()));
 				} else {
 					$messages[] = $emessage;
 				}
 			}
-			$this->error = implode( ', ', $messages );
+			$this->error = implode(', ', $messages);
 		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
 	}
 
 	/**
 	 */
 	public function bulk_header() {
-		$this->feedback( 'skin_upgrade_start' );
+		$this->feedback('skin_upgrade_start');
 	}
 
 	/**
 	 */
 	public function bulk_footer() {
-		$this->feedback( 'skin_upgrade_end' );
+		$this->feedback('skin_upgrade_end');
 	}
 
 	/**
 	 * @param string $title
 	 */
-	public function before( $title = '' ) {
+	public function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
+		printf('<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
 		// This progress messages div gets moved via JavaScript when clicking on "Show details.".
-		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
+		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
 		$this->flush_output();
 	}
 
 	/**
 	 * @param string $title
 	 */
-	public function after( $title = '' ) {
+	public function after($title = '') {
 		echo '</p></div>';
-		if ( $this->error || ! $this->result ) {
-			if ( $this->error ) {
-				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+		if ($this->error || !$this->result) {
+			if ($this->error) {
+				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>') . '</p></div>';
 			} else {
-				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
+				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
+			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
 		}
-		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error ) {
-				echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
-					'<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
-					' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
+		if ($this->result && !is_wp_error($this->result)) {
+			if (!$this->error) {
+				echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr($this->upgrader->update_current) . '">' .
+					'<p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title) .
+					' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __('Show details.') . '</button>' .
 					'</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
 		}
 
 		$this->reset();

brighty/wp-admin/includes/class-plugin-installer-skin.php

Indentation +330 added lines, -330 removed lines

@@ -16,334 +16,334 @@
  * @see WP_Upgrader_Skin
  */
 class Plugin_Installer_Skin extends WP_Upgrader_Skin {
-	public $api;
-	public $type;
-	public $url;
-	public $overwrite;
-
-	private $is_downgrading = false;
-
-	/**
-	 * @param array $args
-	 */
-	public function __construct( $args = array() ) {
-		$defaults = array(
-			'type'      => 'web',
-			'url'       => '',
-			'plugin'    => '',
-			'nonce'     => '',
-			'title'     => '',
-			'overwrite' => '',
-		);
-		$args     = wp_parse_args( $args, $defaults );
-
-		$this->type      = $args['type'];
-		$this->url       = $args['url'];
-		$this->api       = isset( $args['api'] ) ? $args['api'] : array();
-		$this->overwrite = $args['overwrite'];
-
-		parent::__construct( $args );
-	}
-
-	/**
-	 * Action to perform before installing a plugin.
-	 *
-	 * @since 2.8.0
-	 */
-	public function before() {
-		if ( ! empty( $this->api ) ) {
-			$this->upgrader->strings['process_success'] = sprintf(
-				$this->upgrader->strings['process_success_specific'],
-				$this->api->name,
-				$this->api->version
-			);
-		}
-	}
-
-	/**
-	 * Hides the `process_failed` error when updating a plugin by uploading a zip file.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @param WP_Error $wp_error WP_Error object.
-	 * @return bool
-	 */
-	public function hide_process_failed( $wp_error ) {
-		if (
-			'upload' === $this->type &&
-			'' === $this->overwrite &&
-			$wp_error->get_error_code() === 'folder_exists'
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Action to perform following a plugin install.
-	 *
-	 * @since 2.8.0
-	 */
-	public function after() {
-		// Check if the plugin can be overwritten and output the HTML.
-		if ( $this->do_overwrite() ) {
-			return;
-		}
-
-		$plugin_file = $this->upgrader->plugin_info();
-
-		$install_actions = array();
-
-		$from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
-
-		if ( 'import' === $from ) {
-			$install_actions['activate_plugin'] = sprintf(
-				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin &amp; Run Importer' )
-			);
-		} elseif ( 'press-this' === $from ) {
-			$install_actions['activate_plugin'] = sprintf(
-				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin &amp; Go to Press This' )
-			);
-		} else {
-			$install_actions['activate_plugin'] = sprintf(
-				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin' )
-			);
-		}
-
-		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-			$install_actions['network_activate'] = sprintf(
-				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Network Activate' )
-			);
-			unset( $install_actions['activate_plugin'] );
-		}
-
-		if ( 'import' === $from ) {
-			$install_actions['importers_page'] = sprintf(
-				'<a href="%s" target="_parent">%s</a>',
-				admin_url( 'import.php' ),
-				__( 'Go to Importers' )
-			);
-		} elseif ( 'web' === $this->type ) {
-			$install_actions['plugins_page'] = sprintf(
-				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'plugin-install.php' ),
-				__( 'Go to Plugin Installer' )
-			);
-		} elseif ( 'upload' === $this->type && 'plugins' === $from ) {
-			$install_actions['plugins_page'] = sprintf(
-				'<a href="%s">%s</a>',
-				self_admin_url( 'plugin-install.php' ),
-				__( 'Go to Plugin Installer' )
-			);
-		} else {
-			$install_actions['plugins_page'] = sprintf(
-				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'plugins.php' ),
-				__( 'Go to Plugins page' )
-			);
-		}
-
-		if ( ! $this->result || is_wp_error( $this->result ) ) {
-			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
-		} elseif ( ! current_user_can( 'activate_plugin', $plugin_file ) || is_plugin_active( $plugin_file ) ) {
-			unset( $install_actions['activate_plugin'] );
-		}
-
-		/**
-		 * Filters the list of action links available following a single plugin installation.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param string[] $install_actions Array of plugin action links.
-		 * @param object   $api             Object containing WordPress.org API plugin data. Empty
-		 *                                  for non-API installs, such as when a plugin is installed
-		 *                                  via upload.
-		 * @param string   $plugin_file     Path to the plugin file relative to the plugins directory.
-		 */
-		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
-
-		if ( ! empty( $install_actions ) ) {
-			$this->feedback( implode( ' ', (array) $install_actions ) );
-		}
-	}
-
-	/**
-	 * Check if the plugin can be overwritten and output the HTML for overwriting a plugin on upload.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @return bool Whether the plugin can be overwritten and HTML was outputted.
-	 */
-	private function do_overwrite() {
-		if ( 'upload' !== $this->type || ! is_wp_error( $this->result ) || 'folder_exists' !== $this->result->get_error_code() ) {
-			return false;
-		}
-
-		$folder = $this->result->get_error_data( 'folder_exists' );
-		$folder = ltrim( substr( $folder, strlen( WP_PLUGIN_DIR ) ), '/' );
-
-		$current_plugin_data = false;
-		$all_plugins         = get_plugins();
-
-		foreach ( $all_plugins as $plugin => $plugin_data ) {
-			if ( strrpos( $plugin, $folder ) !== 0 ) {
-				continue;
-			}
-
-			$current_plugin_data = $plugin_data;
-		}
-
-		$new_plugin_data = $this->upgrader->new_plugin_data;
-
-		if ( ! $current_plugin_data || ! $new_plugin_data ) {
-			return false;
-		}
-
-		echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This plugin is already installed.' ) . '</h2>';
-
-		$this->is_downgrading = version_compare( $current_plugin_data['Version'], $new_plugin_data['Version'], '>' );
-
-		$rows = array(
-			'Name'        => __( 'Plugin name' ),
-			'Version'     => __( 'Version' ),
-			'Author'      => __( 'Author' ),
-			'RequiresWP'  => __( 'Required WordPress version' ),
-			'RequiresPHP' => __( 'Required PHP version' ),
-		);
-
-		$table  = '<table class="update-from-upload-comparison"><tbody>';
-		$table .= '<tr><th></th><th>' . esc_html_x( 'Current', 'plugin' ) . '</th>';
-		$table .= '<th>' . esc_html_x( 'Uploaded', 'plugin' ) . '</th></tr>';
-
-		$is_same_plugin = true; // Let's consider only these rows.
-
-		foreach ( $rows as $field => $label ) {
-			$old_value = ! empty( $current_plugin_data[ $field ] ) ? (string) $current_plugin_data[ $field ] : '-';
-			$new_value = ! empty( $new_plugin_data[ $field ] ) ? (string) $new_plugin_data[ $field ] : '-';
-
-			$is_same_plugin = $is_same_plugin && ( $old_value === $new_value );
-
-			$diff_field   = ( 'Version' !== $field && $new_value !== $old_value );
-			$diff_version = ( 'Version' === $field && $this->is_downgrading );
-
-			$table .= '<tr><td class="name-label">' . $label . '</td><td>' . wp_strip_all_tags( $old_value ) . '</td>';
-			$table .= ( $diff_field || $diff_version ) ? '<td class="warning">' : '<td>';
-			$table .= wp_strip_all_tags( $new_value ) . '</td></tr>';
-		}
-
-		$table .= '</tbody></table>';
-
-		/**
-		 * Filters the compare table output for overwriting a plugin package on upload.
-		 *
-		 * @since 5.5.0
-		 *
-		 * @param string $table               The output table with Name, Version, Author, RequiresWP, and RequiresPHP info.
-		 * @param array  $current_plugin_data Array with current plugin data.
-		 * @param array  $new_plugin_data     Array with uploaded plugin data.
-		 */
-		echo apply_filters( 'install_plugin_overwrite_comparison', $table, $current_plugin_data, $new_plugin_data );
-
-		$install_actions = array();
-		$can_update      = true;
-
-		$blocked_message  = '<p>' . esc_html__( 'The plugin cannot be updated due to the following:' ) . '</p>';
-		$blocked_message .= '<ul class="ul-disc">';
-
-		$requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
-		$requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
-
-		if ( ! is_php_version_compatible( $requires_php ) ) {
-			$error = sprintf(
-				/* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */
-				__( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ),
-				phpversion(),
-				$requires_php
-			);
-
-			$blocked_message .= '<li>' . esc_html( $error ) . '</li>';
-			$can_update       = false;
-		}
-
-		if ( ! is_wp_version_compatible( $requires_wp ) ) {
-			$error = sprintf(
-				/* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */
-				__( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
-				get_bloginfo( 'version' ),
-				$requires_wp
-			);
-
-			$blocked_message .= '<li>' . esc_html( $error ) . '</li>';
-			$can_update       = false;
-		}
-
-		$blocked_message .= '</ul>';
-
-		if ( $can_update ) {
-			if ( $this->is_downgrading ) {
-				$warning = sprintf(
-					/* translators: %s: Documentation URL. */
-					__( 'You are uploading an older version of a current plugin. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
-				);
-			} else {
-				$warning = sprintf(
-					/* translators: %s: Documentation URL. */
-					__( 'You are updating a plugin. Be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
-				);
-			}
-
-			echo '<p class="update-from-upload-notice">' . $warning . '</p>';
-
-			$overwrite = $this->is_downgrading ? 'downgrade-plugin' : 'update-plugin';
-
-			$install_actions['overwrite_plugin'] = sprintf(
-				'<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ),
-				_x( 'Replace current with uploaded', 'plugin' )
-			);
-		} else {
-			echo $blocked_message;
-		}
-
-		$cancel_url = add_query_arg( 'action', 'upload-plugin-cancel-overwrite', $this->url );
-
-		$install_actions['plugins_page'] = sprintf(
-			'<a class="button" href="%s">%s</a>',
-			wp_nonce_url( $cancel_url, 'plugin-upload-cancel-overwrite' ),
-			__( 'Cancel and go back' )
-		);
-
-		/**
-		 * Filters the list of action links available following a single plugin installation failure
-		 * when overwriting is allowed.
-		 *
-		 * @since 5.5.0
-		 *
-		 * @param string[] $install_actions Array of plugin action links.
-		 * @param object   $api             Object containing WordPress.org API plugin data.
-		 * @param array    $new_plugin_data Array with uploaded plugin data.
-		 */
-		$install_actions = apply_filters( 'install_plugin_overwrite_actions', $install_actions, $this->api, $new_plugin_data );
-
-		if ( ! empty( $install_actions ) ) {
-			printf(
-				'<p class="update-from-upload-expired hidden">%s</p>',
-				__( 'The uploaded file has expired. Please go back and upload it again.' )
-			);
-			echo '<p class="update-from-upload-actions">' . implode( ' ', (array) $install_actions ) . '</p>';
-		}
-
-		return true;
-	}
+    public $api;
+    public $type;
+    public $url;
+    public $overwrite;
+
+    private $is_downgrading = false;
+
+    /**
+     * @param array $args
+     */
+    public function __construct( $args = array() ) {
+        $defaults = array(
+            'type'      => 'web',
+            'url'       => '',
+            'plugin'    => '',
+            'nonce'     => '',
+            'title'     => '',
+            'overwrite' => '',
+        );
+        $args     = wp_parse_args( $args, $defaults );
+
+        $this->type      = $args['type'];
+        $this->url       = $args['url'];
+        $this->api       = isset( $args['api'] ) ? $args['api'] : array();
+        $this->overwrite = $args['overwrite'];
+
+        parent::__construct( $args );
+    }
+
+    /**
+     * Action to perform before installing a plugin.
+     *
+     * @since 2.8.0
+     */
+    public function before() {
+        if ( ! empty( $this->api ) ) {
+            $this->upgrader->strings['process_success'] = sprintf(
+                $this->upgrader->strings['process_success_specific'],
+                $this->api->name,
+                $this->api->version
+            );
+        }
+    }
+
+    /**
+     * Hides the `process_failed` error when updating a plugin by uploading a zip file.
+     *
+     * @since 5.5.0
+     *
+     * @param WP_Error $wp_error WP_Error object.
+     * @return bool
+     */
+    public function hide_process_failed( $wp_error ) {
+        if (
+            'upload' === $this->type &&
+            '' === $this->overwrite &&
+            $wp_error->get_error_code() === 'folder_exists'
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Action to perform following a plugin install.
+     *
+     * @since 2.8.0
+     */
+    public function after() {
+        // Check if the plugin can be overwritten and output the HTML.
+        if ( $this->do_overwrite() ) {
+            return;
+        }
+
+        $plugin_file = $this->upgrader->plugin_info();
+
+        $install_actions = array();
+
+        $from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
+
+        if ( 'import' === $from ) {
+            $install_actions['activate_plugin'] = sprintf(
+                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+                wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+                __( 'Activate Plugin &amp; Run Importer' )
+            );
+        } elseif ( 'press-this' === $from ) {
+            $install_actions['activate_plugin'] = sprintf(
+                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+                wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+                __( 'Activate Plugin &amp; Go to Press This' )
+            );
+        } else {
+            $install_actions['activate_plugin'] = sprintf(
+                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+                wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+                __( 'Activate Plugin' )
+            );
+        }
+
+        if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
+            $install_actions['network_activate'] = sprintf(
+                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+                wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+                __( 'Network Activate' )
+            );
+            unset( $install_actions['activate_plugin'] );
+        }
+
+        if ( 'import' === $from ) {
+            $install_actions['importers_page'] = sprintf(
+                '<a href="%s" target="_parent">%s</a>',
+                admin_url( 'import.php' ),
+                __( 'Go to Importers' )
+            );
+        } elseif ( 'web' === $this->type ) {
+            $install_actions['plugins_page'] = sprintf(
+                '<a href="%s" target="_parent">%s</a>',
+                self_admin_url( 'plugin-install.php' ),
+                __( 'Go to Plugin Installer' )
+            );
+        } elseif ( 'upload' === $this->type && 'plugins' === $from ) {
+            $install_actions['plugins_page'] = sprintf(
+                '<a href="%s">%s</a>',
+                self_admin_url( 'plugin-install.php' ),
+                __( 'Go to Plugin Installer' )
+            );
+        } else {
+            $install_actions['plugins_page'] = sprintf(
+                '<a href="%s" target="_parent">%s</a>',
+                self_admin_url( 'plugins.php' ),
+                __( 'Go to Plugins page' )
+            );
+        }
+
+        if ( ! $this->result || is_wp_error( $this->result ) ) {
+            unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
+        } elseif ( ! current_user_can( 'activate_plugin', $plugin_file ) || is_plugin_active( $plugin_file ) ) {
+            unset( $install_actions['activate_plugin'] );
+        }
+
+        /**
+         * Filters the list of action links available following a single plugin installation.
+         *
+         * @since 2.7.0
+         *
+         * @param string[] $install_actions Array of plugin action links.
+         * @param object   $api             Object containing WordPress.org API plugin data. Empty
+         *                                  for non-API installs, such as when a plugin is installed
+         *                                  via upload.
+         * @param string   $plugin_file     Path to the plugin file relative to the plugins directory.
+         */
+        $install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
+
+        if ( ! empty( $install_actions ) ) {
+            $this->feedback( implode( ' ', (array) $install_actions ) );
+        }
+    }
+
+    /**
+     * Check if the plugin can be overwritten and output the HTML for overwriting a plugin on upload.
+     *
+     * @since 5.5.0
+     *
+     * @return bool Whether the plugin can be overwritten and HTML was outputted.
+     */
+    private function do_overwrite() {
+        if ( 'upload' !== $this->type || ! is_wp_error( $this->result ) || 'folder_exists' !== $this->result->get_error_code() ) {
+            return false;
+        }
+
+        $folder = $this->result->get_error_data( 'folder_exists' );
+        $folder = ltrim( substr( $folder, strlen( WP_PLUGIN_DIR ) ), '/' );
+
+        $current_plugin_data = false;
+        $all_plugins         = get_plugins();
+
+        foreach ( $all_plugins as $plugin => $plugin_data ) {
+            if ( strrpos( $plugin, $folder ) !== 0 ) {
+                continue;
+            }
+
+            $current_plugin_data = $plugin_data;
+        }
+
+        $new_plugin_data = $this->upgrader->new_plugin_data;
+
+        if ( ! $current_plugin_data || ! $new_plugin_data ) {
+            return false;
+        }
+
+        echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This plugin is already installed.' ) . '</h2>';
+
+        $this->is_downgrading = version_compare( $current_plugin_data['Version'], $new_plugin_data['Version'], '>' );
+
+        $rows = array(
+            'Name'        => __( 'Plugin name' ),
+            'Version'     => __( 'Version' ),
+            'Author'      => __( 'Author' ),
+            'RequiresWP'  => __( 'Required WordPress version' ),
+            'RequiresPHP' => __( 'Required PHP version' ),
+        );
+
+        $table  = '<table class="update-from-upload-comparison"><tbody>';
+        $table .= '<tr><th></th><th>' . esc_html_x( 'Current', 'plugin' ) . '</th>';
+        $table .= '<th>' . esc_html_x( 'Uploaded', 'plugin' ) . '</th></tr>';
+
+        $is_same_plugin = true; // Let's consider only these rows.
+
+        foreach ( $rows as $field => $label ) {
+            $old_value = ! empty( $current_plugin_data[ $field ] ) ? (string) $current_plugin_data[ $field ] : '-';
+            $new_value = ! empty( $new_plugin_data[ $field ] ) ? (string) $new_plugin_data[ $field ] : '-';
+
+            $is_same_plugin = $is_same_plugin && ( $old_value === $new_value );
+
+            $diff_field   = ( 'Version' !== $field && $new_value !== $old_value );
+            $diff_version = ( 'Version' === $field && $this->is_downgrading );
+
+            $table .= '<tr><td class="name-label">' . $label . '</td><td>' . wp_strip_all_tags( $old_value ) . '</td>';
+            $table .= ( $diff_field || $diff_version ) ? '<td class="warning">' : '<td>';
+            $table .= wp_strip_all_tags( $new_value ) . '</td></tr>';
+        }
+
+        $table .= '</tbody></table>';
+
+        /**
+         * Filters the compare table output for overwriting a plugin package on upload.
+         *
+         * @since 5.5.0
+         *
+         * @param string $table               The output table with Name, Version, Author, RequiresWP, and RequiresPHP info.
+         * @param array  $current_plugin_data Array with current plugin data.
+         * @param array  $new_plugin_data     Array with uploaded plugin data.
+         */
+        echo apply_filters( 'install_plugin_overwrite_comparison', $table, $current_plugin_data, $new_plugin_data );
+
+        $install_actions = array();
+        $can_update      = true;
+
+        $blocked_message  = '<p>' . esc_html__( 'The plugin cannot be updated due to the following:' ) . '</p>';
+        $blocked_message .= '<ul class="ul-disc">';
+
+        $requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
+        $requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
+
+        if ( ! is_php_version_compatible( $requires_php ) ) {
+            $error = sprintf(
+                /* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */
+                __( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ),
+                phpversion(),
+                $requires_php
+            );
+
+            $blocked_message .= '<li>' . esc_html( $error ) . '</li>';
+            $can_update       = false;
+        }
+
+        if ( ! is_wp_version_compatible( $requires_wp ) ) {
+            $error = sprintf(
+                /* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */
+                __( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
+                get_bloginfo( 'version' ),
+                $requires_wp
+            );
+
+            $blocked_message .= '<li>' . esc_html( $error ) . '</li>';
+            $can_update       = false;
+        }
+
+        $blocked_message .= '</ul>';
+
+        if ( $can_update ) {
+            if ( $this->is_downgrading ) {
+                $warning = sprintf(
+                    /* translators: %s: Documentation URL. */
+                    __( 'You are uploading an older version of a current plugin. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.' ),
+                    __( 'https://wordpress.org/support/article/wordpress-backups/' )
+                );
+            } else {
+                $warning = sprintf(
+                    /* translators: %s: Documentation URL. */
+                    __( 'You are updating a plugin. Be sure to <a href="%s">back up your database and files</a> first.' ),
+                    __( 'https://wordpress.org/support/article/wordpress-backups/' )
+                );
+            }
+
+            echo '<p class="update-from-upload-notice">' . $warning . '</p>';
+
+            $overwrite = $this->is_downgrading ? 'downgrade-plugin' : 'update-plugin';
+
+            $install_actions['overwrite_plugin'] = sprintf(
+                '<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
+                wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ),
+                _x( 'Replace current with uploaded', 'plugin' )
+            );
+        } else {
+            echo $blocked_message;
+        }
+
+        $cancel_url = add_query_arg( 'action', 'upload-plugin-cancel-overwrite', $this->url );
+
+        $install_actions['plugins_page'] = sprintf(
+            '<a class="button" href="%s">%s</a>',
+            wp_nonce_url( $cancel_url, 'plugin-upload-cancel-overwrite' ),
+            __( 'Cancel and go back' )
+        );
+
+        /**
+         * Filters the list of action links available following a single plugin installation failure
+         * when overwriting is allowed.
+         *
+         * @since 5.5.0
+         *
+         * @param string[] $install_actions Array of plugin action links.
+         * @param object   $api             Object containing WordPress.org API plugin data.
+         * @param array    $new_plugin_data Array with uploaded plugin data.
+         */
+        $install_actions = apply_filters( 'install_plugin_overwrite_actions', $install_actions, $this->api, $new_plugin_data );
+
+        if ( ! empty( $install_actions ) ) {
+            printf(
+                '<p class="update-from-upload-expired hidden">%s</p>',
+                __( 'The uploaded file has expired. Please go back and upload it again.' )
+            );
+            echo '<p class="update-from-upload-actions">' . implode( ' ', (array) $install_actions ) . '</p>';
+        }
+
+        return true;
+    }
 }

Spacing +88 added lines, -88 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$defaults = array(
 			'type'      => 'web',
 			'url'       => '',
@@ -35,14 +35,14 @@ 
 			'title'     => '',
 			'overwrite' => '',
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$this->type      = $args['type'];
 		$this->url       = $args['url'];
-		$this->api       = isset( $args['api'] ) ? $args['api'] : array();
+		$this->api       = isset($args['api']) ? $args['api'] : array();
 		$this->overwrite = $args['overwrite'];
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
@@ -51,7 +51,7 @@ 
 	 * @since 2.8.0
 	 */
 	public function before() {
-		if ( ! empty( $this->api ) ) {
+		if (!empty($this->api)) {
 			$this->upgrader->strings['process_success'] = sprintf(
 				$this->upgrader->strings['process_success_specific'],
 				$this->api->name,
@@ -68,7 +68,7 @@ 
 	 * @param WP_Error $wp_error WP_Error object.
 	 * @return bool
 	 */
-	public function hide_process_failed( $wp_error ) {
+	public function hide_process_failed($wp_error) {
 		if (
 			'upload' === $this->type &&
 			'' === $this->overwrite &&
@@ -87,7 +87,7 @@ 
 	 */
 	public function after() {
 		// Check if the plugin can be overwritten and output the HTML.
-		if ( $this->do_overwrite() ) {
+		if ($this->do_overwrite()) {
 			return;
 		}
 
@@ -95,67 +95,67 @@ 
 
 		$install_actions = array();
 
-		$from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
+		$from = isset($_GET['from']) ? wp_unslash($_GET['from']) : 'plugins';
 
-		if ( 'import' === $from ) {
+		if ('import' === $from) {
 			$install_actions['activate_plugin'] = sprintf(
 				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin &amp; Run Importer' )
+				wp_nonce_url('plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode($plugin_file), 'activate-plugin_' . $plugin_file),
+				__('Activate Plugin &amp; Run Importer')
 			);
-		} elseif ( 'press-this' === $from ) {
+		} elseif ('press-this' === $from) {
 			$install_actions['activate_plugin'] = sprintf(
 				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin &amp; Go to Press This' )
+				wp_nonce_url('plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode($plugin_file), 'activate-plugin_' . $plugin_file),
+				__('Activate Plugin &amp; Go to Press This')
 			);
 		} else {
 			$install_actions['activate_plugin'] = sprintf(
 				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Activate Plugin' )
+				wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode($plugin_file), 'activate-plugin_' . $plugin_file),
+				__('Activate Plugin')
 			);
 		}
 
-		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
+		if (is_multisite() && current_user_can('manage_network_plugins')) {
 			$install_actions['network_activate'] = sprintf(
 				'<a class="button button-primary" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
-				__( 'Network Activate' )
+				wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode($plugin_file), 'activate-plugin_' . $plugin_file),
+				__('Network Activate')
 			);
-			unset( $install_actions['activate_plugin'] );
+			unset($install_actions['activate_plugin']);
 		}
 
-		if ( 'import' === $from ) {
+		if ('import' === $from) {
 			$install_actions['importers_page'] = sprintf(
 				'<a href="%s" target="_parent">%s</a>',
-				admin_url( 'import.php' ),
-				__( 'Go to Importers' )
+				admin_url('import.php'),
+				__('Go to Importers')
 			);
-		} elseif ( 'web' === $this->type ) {
+		} elseif ('web' === $this->type) {
 			$install_actions['plugins_page'] = sprintf(
 				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'plugin-install.php' ),
-				__( 'Go to Plugin Installer' )
+				self_admin_url('plugin-install.php'),
+				__('Go to Plugin Installer')
 			);
-		} elseif ( 'upload' === $this->type && 'plugins' === $from ) {
+		} elseif ('upload' === $this->type && 'plugins' === $from) {
 			$install_actions['plugins_page'] = sprintf(
 				'<a href="%s">%s</a>',
-				self_admin_url( 'plugin-install.php' ),
-				__( 'Go to Plugin Installer' )
+				self_admin_url('plugin-install.php'),
+				__('Go to Plugin Installer')
 			);
 		} else {
 			$install_actions['plugins_page'] = sprintf(
 				'<a href="%s" target="_parent">%s</a>',
-				self_admin_url( 'plugins.php' ),
-				__( 'Go to Plugins page' )
+				self_admin_url('plugins.php'),
+				__('Go to Plugins page')
 			);
 		}
 
-		if ( ! $this->result || is_wp_error( $this->result ) ) {
-			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
-		} elseif ( ! current_user_can( 'activate_plugin', $plugin_file ) || is_plugin_active( $plugin_file ) ) {
-			unset( $install_actions['activate_plugin'] );
+		if (!$this->result || is_wp_error($this->result)) {
+			unset($install_actions['activate_plugin'], $install_actions['network_activate']);
+		} elseif (!current_user_can('activate_plugin', $plugin_file) || is_plugin_active($plugin_file)) {
+			unset($install_actions['activate_plugin']);
 		}
 
 		/**
@@ -169,10 +169,10 @@ 
 		 *                                  via upload.
 		 * @param string   $plugin_file     Path to the plugin file relative to the plugins directory.
 		 */
-		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
+		$install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
 
-		if ( ! empty( $install_actions ) ) {
-			$this->feedback( implode( ' ', (array) $install_actions ) );
+		if (!empty($install_actions)) {
+			$this->feedback(implode(' ', (array) $install_actions));
 		}
 	}
 
@@ -184,18 +184,18 @@ 
 	 * @return bool Whether the plugin can be overwritten and HTML was outputted.
 	 */
 	private function do_overwrite() {
-		if ( 'upload' !== $this->type || ! is_wp_error( $this->result ) || 'folder_exists' !== $this->result->get_error_code() ) {
+		if ('upload' !== $this->type || !is_wp_error($this->result) || 'folder_exists' !== $this->result->get_error_code()) {
 			return false;
 		}
 
-		$folder = $this->result->get_error_data( 'folder_exists' );
-		$folder = ltrim( substr( $folder, strlen( WP_PLUGIN_DIR ) ), '/' );
+		$folder = $this->result->get_error_data('folder_exists');
+		$folder = ltrim(substr($folder, strlen(WP_PLUGIN_DIR)), '/');
 
 		$current_plugin_data = false;
 		$all_plugins         = get_plugins();
 
-		foreach ( $all_plugins as $plugin => $plugin_data ) {
-			if ( strrpos( $plugin, $folder ) !== 0 ) {
+		foreach ($all_plugins as $plugin => $plugin_data) {
+			if (strrpos($plugin, $folder) !== 0) {
 				continue;
 			}
 
@@ -204,40 +204,40 @@ 
 
 		$new_plugin_data = $this->upgrader->new_plugin_data;
 
-		if ( ! $current_plugin_data || ! $new_plugin_data ) {
+		if (!$current_plugin_data || !$new_plugin_data) {
 			return false;
 		}
 
-		echo '<h2 class="update-from-upload-heading">' . esc_html__( 'This plugin is already installed.' ) . '</h2>';
+		echo '<h2 class="update-from-upload-heading">' . esc_html__('This plugin is already installed.') . '</h2>';
 
-		$this->is_downgrading = version_compare( $current_plugin_data['Version'], $new_plugin_data['Version'], '>' );
+		$this->is_downgrading = version_compare($current_plugin_data['Version'], $new_plugin_data['Version'], '>');
 
 		$rows = array(
-			'Name'        => __( 'Plugin name' ),
-			'Version'     => __( 'Version' ),
-			'Author'      => __( 'Author' ),
-			'RequiresWP'  => __( 'Required WordPress version' ),
-			'RequiresPHP' => __( 'Required PHP version' ),
+			'Name'        => __('Plugin name'),
+			'Version'     => __('Version'),
+			'Author'      => __('Author'),
+			'RequiresWP'  => __('Required WordPress version'),
+			'RequiresPHP' => __('Required PHP version'),
 		);
 
 		$table  = '<table class="update-from-upload-comparison"><tbody>';
-		$table .= '<tr><th></th><th>' . esc_html_x( 'Current', 'plugin' ) . '</th>';
-		$table .= '<th>' . esc_html_x( 'Uploaded', 'plugin' ) . '</th></tr>';
+		$table .= '<tr><th></th><th>' . esc_html_x('Current', 'plugin') . '</th>';
+		$table .= '<th>' . esc_html_x('Uploaded', 'plugin') . '</th></tr>';
 
 		$is_same_plugin = true; // Let's consider only these rows.
 
-		foreach ( $rows as $field => $label ) {
-			$old_value = ! empty( $current_plugin_data[ $field ] ) ? (string) $current_plugin_data[ $field ] : '-';
-			$new_value = ! empty( $new_plugin_data[ $field ] ) ? (string) $new_plugin_data[ $field ] : '-';
+		foreach ($rows as $field => $label) {
+			$old_value = !empty($current_plugin_data[$field]) ? (string) $current_plugin_data[$field] : '-';
+			$new_value = !empty($new_plugin_data[$field]) ? (string) $new_plugin_data[$field] : '-';
 
-			$is_same_plugin = $is_same_plugin && ( $old_value === $new_value );
+			$is_same_plugin = $is_same_plugin && ($old_value === $new_value);
 
-			$diff_field   = ( 'Version' !== $field && $new_value !== $old_value );
-			$diff_version = ( 'Version' === $field && $this->is_downgrading );
+			$diff_field   = ('Version' !== $field && $new_value !== $old_value);
+			$diff_version = ('Version' === $field && $this->is_downgrading);
 
-			$table .= '<tr><td class="name-label">' . $label . '</td><td>' . wp_strip_all_tags( $old_value ) . '</td>';
-			$table .= ( $diff_field || $diff_version ) ? '<td class="warning">' : '<td>';
-			$table .= wp_strip_all_tags( $new_value ) . '</td></tr>';
+			$table .= '<tr><td class="name-label">' . $label . '</td><td>' . wp_strip_all_tags($old_value) . '</td>';
+			$table .= ($diff_field || $diff_version) ? '<td class="warning">' : '<td>';
+			$table .= wp_strip_all_tags($new_value) . '</td></tr>';
 		}
 
 		$table .= '</tbody></table>';
@@ -251,55 +251,55 @@ 
 		 * @param array  $current_plugin_data Array with current plugin data.
 		 * @param array  $new_plugin_data     Array with uploaded plugin data.
 		 */
-		echo apply_filters( 'install_plugin_overwrite_comparison', $table, $current_plugin_data, $new_plugin_data );
+		echo apply_filters('install_plugin_overwrite_comparison', $table, $current_plugin_data, $new_plugin_data);
 
 		$install_actions = array();
 		$can_update      = true;
 
-		$blocked_message  = '<p>' . esc_html__( 'The plugin cannot be updated due to the following:' ) . '</p>';
+		$blocked_message  = '<p>' . esc_html__('The plugin cannot be updated due to the following:') . '</p>';
 		$blocked_message .= '<ul class="ul-disc">';
 
-		$requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
-		$requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
+		$requires_php = isset($new_plugin_data['RequiresPHP']) ? $new_plugin_data['RequiresPHP'] : null;
+		$requires_wp  = isset($new_plugin_data['RequiresWP']) ? $new_plugin_data['RequiresWP'] : null;
 
-		if ( ! is_php_version_compatible( $requires_php ) ) {
+		if (!is_php_version_compatible($requires_php)) {
 			$error = sprintf(
 				/* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */
-				__( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ),
+				__('The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.'),
 				phpversion(),
 				$requires_php
 			);
 
-			$blocked_message .= '<li>' . esc_html( $error ) . '</li>';
+			$blocked_message .= '<li>' . esc_html($error) . '</li>';
 			$can_update       = false;
 		}
 
-		if ( ! is_wp_version_compatible( $requires_wp ) ) {
+		if (!is_wp_version_compatible($requires_wp)) {
 			$error = sprintf(
 				/* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */
-				__( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
-				get_bloginfo( 'version' ),
+				__('Your WordPress version is %1$s, however the uploaded plugin requires %2$s.'),
+				get_bloginfo('version'),
 				$requires_wp
 			);
 
-			$blocked_message .= '<li>' . esc_html( $error ) . '</li>';
+			$blocked_message .= '<li>' . esc_html($error) . '</li>';
 			$can_update       = false;
 		}
 
 		$blocked_message .= '</ul>';
 
-		if ( $can_update ) {
-			if ( $this->is_downgrading ) {
+		if ($can_update) {
+			if ($this->is_downgrading) {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
-					__( 'You are uploading an older version of a current plugin. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__('You are uploading an older version of a current plugin. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.'),
+					__('https://wordpress.org/support/article/wordpress-backups/')
 				);
 			} else {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
-					__( 'You are updating a plugin. Be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__('You are updating a plugin. Be sure to <a href="%s">back up your database and files</a> first.'),
+					__('https://wordpress.org/support/article/wordpress-backups/')
 				);
 			}
 
@@ -309,19 +309,19 @@ 
 
 			$install_actions['overwrite_plugin'] = sprintf(
 				'<a class="button button-primary update-from-upload-overwrite" href="%s" target="_parent">%s</a>',
-				wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'plugin-upload' ),
-				_x( 'Replace current with uploaded', 'plugin' )
+				wp_nonce_url(add_query_arg('overwrite', $overwrite, $this->url), 'plugin-upload'),
+				_x('Replace current with uploaded', 'plugin')
 			);
 		} else {
 			echo $blocked_message;
 		}
 
-		$cancel_url = add_query_arg( 'action', 'upload-plugin-cancel-overwrite', $this->url );
+		$cancel_url = add_query_arg('action', 'upload-plugin-cancel-overwrite', $this->url);
 
 		$install_actions['plugins_page'] = sprintf(
 			'<a class="button" href="%s">%s</a>',
-			wp_nonce_url( $cancel_url, 'plugin-upload-cancel-overwrite' ),
-			__( 'Cancel and go back' )
+			wp_nonce_url($cancel_url, 'plugin-upload-cancel-overwrite'),
+			__('Cancel and go back')
 		);
 
 		/**
@@ -334,14 +334,14 @@ 
 		 * @param object   $api             Object containing WordPress.org API plugin data.
 		 * @param array    $new_plugin_data Array with uploaded plugin data.
 		 */
-		$install_actions = apply_filters( 'install_plugin_overwrite_actions', $install_actions, $this->api, $new_plugin_data );
+		$install_actions = apply_filters('install_plugin_overwrite_actions', $install_actions, $this->api, $new_plugin_data);
 
-		if ( ! empty( $install_actions ) ) {
+		if (!empty($install_actions)) {
 			printf(
 				'<p class="update-from-upload-expired hidden">%s</p>',
-				__( 'The uploaded file has expired. Please go back and upload it again.' )
+				__('The uploaded file has expired. Please go back and upload it again.')
 			);
-			echo '<p class="update-from-upload-actions">' . implode( ' ', (array) $install_actions ) . '</p>';
+			echo '<p class="update-from-upload-actions">' . implode(' ', (array) $install_actions) . '</p>';
 		}
 
 		return true;

brighty/wp-admin/includes/translation-install.php

Indentation +197 added lines, -197 removed lines

@@ -17,96 +17,96 @@ 
  * @return array|WP_Error On success an associative array of translations, WP_Error on failure.
  */
 function translations_api( $type, $args = null ) {
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-
-	if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ), true ) ) {
-		return new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
-	}
-
-	/**
-	 * Allows a plugin to override the WordPress.org Translation Installation API entirely.
-	 *
-	 * @since 4.0.0
-	 *
-	 * @param false|array $result The result array. Default false.
-	 * @param string      $type   The type of translations being requested.
-	 * @param object      $args   Translation API arguments.
-	 */
-	$res = apply_filters( 'translations_api', false, $type, $args );
-
-	if ( false === $res ) {
-		$url      = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
-		$http_url = $url;
-		$ssl      = wp_http_supports( array( 'ssl' ) );
-		if ( $ssl ) {
-			$url = set_url_scheme( $url, 'https' );
-		}
-
-		$options = array(
-			'timeout' => 3,
-			'body'    => array(
-				'wp_version' => $wp_version,
-				'locale'     => get_locale(),
-				'version'    => $args['version'], // Version of plugin, theme or core.
-			),
-		);
-
-		if ( 'core' !== $type ) {
-			$options['body']['slug'] = $args['slug']; // Plugin or theme slug.
-		}
-
-		$request = wp_remote_post( $url, $options );
-
-		if ( $ssl && is_wp_error( $request ) ) {
-			trigger_error(
-				sprintf(
-					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
-				) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
-				headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
-			);
-
-			$request = wp_remote_post( $http_url, $options );
-		}
-
-		if ( is_wp_error( $request ) ) {
-			$res = new WP_Error(
-				'translations_api_failed',
-				sprintf(
-					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
-				),
-				$request->get_error_message()
-			);
-		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error(
-					'translations_api_failed',
-					sprintf(
-						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
-					),
-					wp_remote_retrieve_body( $request )
-				);
-			}
-		}
-	}
-
-	/**
-	 * Filters the Translation Installation API response results.
-	 *
-	 * @since 4.0.0
-	 *
-	 * @param array|WP_Error $res  Response as an associative array or WP_Error.
-	 * @param string         $type The type of translations being requested.
-	 * @param object         $args Translation API arguments.
-	 */
-	return apply_filters( 'translations_api_result', $res, $type, $args );
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+
+    if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ), true ) ) {
+        return new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
+    }
+
+    /**
+     * Allows a plugin to override the WordPress.org Translation Installation API entirely.
+     *
+     * @since 4.0.0
+     *
+     * @param false|array $result The result array. Default false.
+     * @param string      $type   The type of translations being requested.
+     * @param object      $args   Translation API arguments.
+     */
+    $res = apply_filters( 'translations_api', false, $type, $args );
+
+    if ( false === $res ) {
+        $url      = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
+        $http_url = $url;
+        $ssl      = wp_http_supports( array( 'ssl' ) );
+        if ( $ssl ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $options = array(
+            'timeout' => 3,
+            'body'    => array(
+                'wp_version' => $wp_version,
+                'locale'     => get_locale(),
+                'version'    => $args['version'], // Version of plugin, theme or core.
+            ),
+        );
+
+        if ( 'core' !== $type ) {
+            $options['body']['slug'] = $args['slug']; // Plugin or theme slug.
+        }
+
+        $request = wp_remote_post( $url, $options );
+
+        if ( $ssl && is_wp_error( $request ) ) {
+            trigger_error(
+                sprintf(
+                    /* translators: %s: Support forums URL. */
+                    __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                    __( 'https://wordpress.org/support/forums/' )
+                ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+                headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+            );
+
+            $request = wp_remote_post( $http_url, $options );
+        }
+
+        if ( is_wp_error( $request ) ) {
+            $res = new WP_Error(
+                'translations_api_failed',
+                sprintf(
+                    /* translators: %s: Support forums URL. */
+                    __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                    __( 'https://wordpress.org/support/forums/' )
+                ),
+                $request->get_error_message()
+            );
+        } else {
+            $res = json_decode( wp_remote_retrieve_body( $request ), true );
+            if ( ! is_object( $res ) && ! is_array( $res ) ) {
+                $res = new WP_Error(
+                    'translations_api_failed',
+                    sprintf(
+                        /* translators: %s: Support forums URL. */
+                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                        __( 'https://wordpress.org/support/forums/' )
+                    ),
+                    wp_remote_retrieve_body( $request )
+                );
+            }
+        }
+    }
+
+    /**
+     * Filters the Translation Installation API response results.
+     *
+     * @since 4.0.0
+     *
+     * @param array|WP_Error $res  Response as an associative array or WP_Error.
+     * @param string         $type The type of translations being requested.
+     * @param object         $args Translation API arguments.
+     */
+    return apply_filters( 'translations_api_result', $res, $type, $args );
 }
 
 /**
@@ -120,33 +120,33 @@ 
  *                 in an error, an empty array will be returned.
  */
 function wp_get_available_translations() {
-	if ( ! wp_installing() ) {
-		$translations = get_site_transient( 'available_translations' );
-		if ( false !== $translations ) {
-			return $translations;
-		}
-	}
+    if ( ! wp_installing() ) {
+        $translations = get_site_transient( 'available_translations' );
+        if ( false !== $translations ) {
+            return $translations;
+        }
+    }
 
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
 
-	$api = translations_api( 'core', array( 'version' => $wp_version ) );
+    $api = translations_api( 'core', array( 'version' => $wp_version ) );
 
-	if ( is_wp_error( $api ) || empty( $api['translations'] ) ) {
-		return array();
-	}
+    if ( is_wp_error( $api ) || empty( $api['translations'] ) ) {
+        return array();
+    }
 
-	$translations = array();
-	// Key the array with the language code for now.
-	foreach ( $api['translations'] as $translation ) {
-		$translations[ $translation['language'] ] = $translation;
-	}
+    $translations = array();
+    // Key the array with the language code for now.
+    foreach ( $api['translations'] as $translation ) {
+        $translations[ $translation['language'] ] = $translation;
+    }
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		set_site_transient( 'available_translations', $translations, 3 * HOUR_IN_SECONDS );
-	}
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        set_site_transient( 'available_translations', $translations, 3 * HOUR_IN_SECONDS );
+    }
 
-	return $translations;
+    return $translations;
 }
 
 /**
@@ -159,43 +159,43 @@ 
  * @param array[] $languages Array of available languages (populated via the Translation API).
  */
 function wp_install_language_form( $languages ) {
-	global $wp_local_package;
-
-	$installed_languages = get_available_languages();
-
-	echo "<label class='screen-reader-text' for='language'>Select a default language</label>\n";
-	echo "<select size='14' name='language' id='language'>\n";
-	echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
-	echo "\n";
-
-	if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
-		if ( isset( $languages[ $wp_local_package ] ) ) {
-			$language = $languages[ $wp_local_package ];
-			printf(
-				'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-				esc_attr( $language['language'] ),
-				esc_attr( current( $language['iso'] ) ),
-				esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
-				in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
-				esc_html( $language['native_name'] )
-			);
-
-			unset( $languages[ $wp_local_package ] );
-		}
-	}
-
-	foreach ( $languages as $language ) {
-		printf(
-			'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-			esc_attr( $language['language'] ),
-			esc_attr( current( $language['iso'] ) ),
-			esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
-			in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
-			esc_html( $language['native_name'] )
-		);
-	}
-	echo "</select>\n";
-	echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';
+    global $wp_local_package;
+
+    $installed_languages = get_available_languages();
+
+    echo "<label class='screen-reader-text' for='language'>Select a default language</label>\n";
+    echo "<select size='14' name='language' id='language'>\n";
+    echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
+    echo "\n";
+
+    if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
+        if ( isset( $languages[ $wp_local_package ] ) ) {
+            $language = $languages[ $wp_local_package ];
+            printf(
+                '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+                esc_attr( $language['language'] ),
+                esc_attr( current( $language['iso'] ) ),
+                esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
+                in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
+                esc_html( $language['native_name'] )
+            );
+
+            unset( $languages[ $wp_local_package ] );
+        }
+    }
+
+    foreach ( $languages as $language ) {
+        printf(
+            '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+            esc_attr( $language['language'] ),
+            esc_attr( current( $language['iso'] ) ),
+            esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
+            in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
+            esc_html( $language['native_name'] )
+        );
+    }
+    echo "</select>\n";
+    echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';
 }
 
 /**
@@ -210,43 +210,43 @@ 
  *                      (or already installed), or false on failure.
  */
 function wp_download_language_pack( $download ) {
-	// Check if the translation is already installed.
-	if ( in_array( $download, get_available_languages(), true ) ) {
-		return $download;
-	}
-
-	if ( ! wp_is_file_mod_allowed( 'download_language_pack' ) ) {
-		return false;
-	}
-
-	// Confirm the translation is one we can download.
-	$translations = wp_get_available_translations();
-	if ( ! $translations ) {
-		return false;
-	}
-	foreach ( $translations as $translation ) {
-		if ( $translation['language'] === $download ) {
-			$translation_to_load = true;
-			break;
-		}
-	}
-
-	if ( empty( $translation_to_load ) ) {
-		return false;
-	}
-	$translation = (object) $translation;
-
-	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin              = new Automatic_Upgrader_Skin;
-	$upgrader          = new Language_Pack_Upgrader( $skin );
-	$translation->type = 'core';
-	$result            = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
-
-	if ( ! $result || is_wp_error( $result ) ) {
-		return false;
-	}
-
-	return $translation->language;
+    // Check if the translation is already installed.
+    if ( in_array( $download, get_available_languages(), true ) ) {
+        return $download;
+    }
+
+    if ( ! wp_is_file_mod_allowed( 'download_language_pack' ) ) {
+        return false;
+    }
+
+    // Confirm the translation is one we can download.
+    $translations = wp_get_available_translations();
+    if ( ! $translations ) {
+        return false;
+    }
+    foreach ( $translations as $translation ) {
+        if ( $translation['language'] === $download ) {
+            $translation_to_load = true;
+            break;
+        }
+    }
+
+    if ( empty( $translation_to_load ) ) {
+        return false;
+    }
+    $translation = (object) $translation;
+
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $skin              = new Automatic_Upgrader_Skin;
+    $upgrader          = new Language_Pack_Upgrader( $skin );
+    $translation->type = 'core';
+    $result            = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+
+    if ( ! $result || is_wp_error( $result ) ) {
+        return false;
+    }
+
+    return $translation->language;
 }
 
 /**
@@ -258,20 +258,20 @@ 
  * @return bool Returns true on success, false on failure.
  */
 function wp_can_install_language_pack() {
-	if ( ! wp_is_file_mod_allowed( 'can_install_language_pack' ) ) {
-		return false;
-	}
+    if ( ! wp_is_file_mod_allowed( 'can_install_language_pack' ) ) {
+        return false;
+    }
 
-	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin     = new Automatic_Upgrader_Skin;
-	$upgrader = new Language_Pack_Upgrader( $skin );
-	$upgrader->init();
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $skin     = new Automatic_Upgrader_Skin;
+    $upgrader = new Language_Pack_Upgrader( $skin );
+    $upgrader->init();
 
-	$check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
+    $check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
 
-	if ( ! $check || is_wp_error( $check ) ) {
-		return false;
-	}
+    if ( ! $check || is_wp_error( $check ) ) {
+        return false;
+    }
 
-	return true;
+    return true;
 }

Spacing +63 added lines, -63 removed lines

@@ -16,12 +16,12 @@ 
  * @param array|object $args Translation API arguments. Optional.
  * @return array|WP_Error On success an associative array of translations, WP_Error on failure.
  */
-function translations_api( $type, $args = null ) {
+function translations_api($type, $args = null) {
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ), true ) ) {
-		return new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
+	if (!in_array($type, array('plugins', 'themes', 'core'), true)) {
+		return new WP_Error('invalid_type', __('Invalid translation type.'));
 	}
 
 	/**
@@ -33,14 +33,14 @@ 
 	 * @param string      $type   The type of translations being requested.
 	 * @param object      $args   Translation API arguments.
 	 */
-	$res = apply_filters( 'translations_api', false, $type, $args );
+	$res = apply_filters('translations_api', false, $type, $args);
 
-	if ( false === $res ) {
+	if (false === $res) {
 		$url      = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
 		$http_url = $url;
-		$ssl      = wp_http_supports( array( 'ssl' ) );
-		if ( $ssl ) {
-			$url = set_url_scheme( $url, 'https' );
+		$ssl      = wp_http_supports(array('ssl'));
+		if ($ssl) {
+			$url = set_url_scheme($url, 'https');
 		}
 
 		$options = array(
@@ -52,46 +52,46 @@ 
 			),
 		);
 
-		if ( 'core' !== $type ) {
+		if ('core' !== $type) {
 			$options['body']['slug'] = $args['slug']; // Plugin or theme slug.
 		}
 
-		$request = wp_remote_post( $url, $options );
+		$request = wp_remote_post($url, $options);
 
-		if ( $ssl && is_wp_error( $request ) ) {
+		if ($ssl && is_wp_error($request)) {
 			trigger_error(
 				sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
-				) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+					__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+					__('https://wordpress.org/support/forums/')
+				) . ' ' . __('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'),
 				headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 			);
 
-			$request = wp_remote_post( $http_url, $options );
+			$request = wp_remote_post($http_url, $options);
 		}
 
-		if ( is_wp_error( $request ) ) {
+		if (is_wp_error($request)) {
 			$res = new WP_Error(
 				'translations_api_failed',
 				sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
+					__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+					__('https://wordpress.org/support/forums/')
 				),
 				$request->get_error_message()
 			);
 		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+			$res = json_decode(wp_remote_retrieve_body($request), true);
+			if (!is_object($res) && !is_array($res)) {
 				$res = new WP_Error(
 					'translations_api_failed',
 					sprintf(
 						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
+						__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+						__('https://wordpress.org/support/forums/')
 					),
-					wp_remote_retrieve_body( $request )
+					wp_remote_retrieve_body($request)
 				);
 			}
 		}
@@ -106,7 +106,7 @@ 
 	 * @param string         $type The type of translations being requested.
 	 * @param object         $args Translation API arguments.
 	 */
-	return apply_filters( 'translations_api_result', $res, $type, $args );
+	return apply_filters('translations_api_result', $res, $type, $args);
 }
 
 /**
@@ -120,9 +120,9 @@ 
  *                 in an error, an empty array will be returned.
  */
 function wp_get_available_translations() {
-	if ( ! wp_installing() ) {
-		$translations = get_site_transient( 'available_translations' );
-		if ( false !== $translations ) {
+	if (!wp_installing()) {
+		$translations = get_site_transient('available_translations');
+		if (false !== $translations) {
 			return $translations;
 		}
 	}
@@ -130,20 +130,20 @@ 
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	$api = translations_api( 'core', array( 'version' => $wp_version ) );
+	$api = translations_api('core', array('version' => $wp_version));
 
-	if ( is_wp_error( $api ) || empty( $api['translations'] ) ) {
+	if (is_wp_error($api) || empty($api['translations'])) {
 		return array();
 	}
 
 	$translations = array();
 	// Key the array with the language code for now.
-	foreach ( $api['translations'] as $translation ) {
-		$translations[ $translation['language'] ] = $translation;
+	foreach ($api['translations'] as $translation) {
+		$translations[$translation['language']] = $translation;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		set_site_transient( 'available_translations', $translations, 3 * HOUR_IN_SECONDS );
+	if (!defined('WP_INSTALLING')) {
+		set_site_transient('available_translations', $translations, 3 * HOUR_IN_SECONDS);
 	}
 
 	return $translations;
@@ -158,7 +158,7 @@ 
  *
  * @param array[] $languages Array of available languages (populated via the Translation API).
  */
-function wp_install_language_form( $languages ) {
+function wp_install_language_form($languages) {
 	global $wp_local_package;
 
 	$installed_languages = get_available_languages();
@@ -168,30 +168,30 @@ 
 	echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
 	echo "\n";
 
-	if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
-		if ( isset( $languages[ $wp_local_package ] ) ) {
-			$language = $languages[ $wp_local_package ];
+	if (!empty($wp_local_package) && isset($languages[$wp_local_package])) {
+		if (isset($languages[$wp_local_package])) {
+			$language = $languages[$wp_local_package];
 			printf(
 				'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-				esc_attr( $language['language'] ),
-				esc_attr( current( $language['iso'] ) ),
-				esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
-				in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
-				esc_html( $language['native_name'] )
+				esc_attr($language['language']),
+				esc_attr(current($language['iso'])),
+				esc_attr($language['strings']['continue'] ? $language['strings']['continue'] : 'Continue'),
+				in_array($language['language'], $installed_languages, true) ? ' data-installed="1"' : '',
+				esc_html($language['native_name'])
 			);
 
-			unset( $languages[ $wp_local_package ] );
+			unset($languages[$wp_local_package]);
 		}
 	}
 
-	foreach ( $languages as $language ) {
+	foreach ($languages as $language) {
 		printf(
 			'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-			esc_attr( $language['language'] ),
-			esc_attr( current( $language['iso'] ) ),
-			esc_attr( $language['strings']['continue'] ? $language['strings']['continue'] : 'Continue' ),
-			in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
-			esc_html( $language['native_name'] )
+			esc_attr($language['language']),
+			esc_attr(current($language['iso'])),
+			esc_attr($language['strings']['continue'] ? $language['strings']['continue'] : 'Continue'),
+			in_array($language['language'], $installed_languages, true) ? ' data-installed="1"' : '',
+			esc_html($language['native_name'])
 		);
 	}
 	echo "</select>\n";
@@ -209,40 +209,40 @@ 
  * @return string|false Returns the language code if successfully downloaded
  *                      (or already installed), or false on failure.
  */
-function wp_download_language_pack( $download ) {
+function wp_download_language_pack($download) {
 	// Check if the translation is already installed.
-	if ( in_array( $download, get_available_languages(), true ) ) {
+	if (in_array($download, get_available_languages(), true)) {
 		return $download;
 	}
 
-	if ( ! wp_is_file_mod_allowed( 'download_language_pack' ) ) {
+	if (!wp_is_file_mod_allowed('download_language_pack')) {
 		return false;
 	}
 
 	// Confirm the translation is one we can download.
 	$translations = wp_get_available_translations();
-	if ( ! $translations ) {
+	if (!$translations) {
 		return false;
 	}
-	foreach ( $translations as $translation ) {
-		if ( $translation['language'] === $download ) {
+	foreach ($translations as $translation) {
+		if ($translation['language'] === $download) {
 			$translation_to_load = true;
 			break;
 		}
 	}
 
-	if ( empty( $translation_to_load ) ) {
+	if (empty($translation_to_load)) {
 		return false;
 	}
 	$translation = (object) $translation;
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$skin              = new Automatic_Upgrader_Skin;
-	$upgrader          = new Language_Pack_Upgrader( $skin );
+	$upgrader          = new Language_Pack_Upgrader($skin);
 	$translation->type = 'core';
-	$result            = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+	$result            = $upgrader->upgrade($translation, array('clear_update_cache' => false));
 
-	if ( ! $result || is_wp_error( $result ) ) {
+	if (!$result || is_wp_error($result)) {
 		return false;
 	}
 
@@ -258,18 +258,18 @@ 
  * @return bool Returns true on success, false on failure.
  */
 function wp_can_install_language_pack() {
-	if ( ! wp_is_file_mod_allowed( 'can_install_language_pack' ) ) {
+	if (!wp_is_file_mod_allowed('can_install_language_pack')) {
 		return false;
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 	$skin     = new Automatic_Upgrader_Skin;
-	$upgrader = new Language_Pack_Upgrader( $skin );
+	$upgrader = new Language_Pack_Upgrader($skin);
 	$upgrader->init();
 
-	$check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
+	$check = $upgrader->fs_connect(array(WP_CONTENT_DIR, WP_LANG_DIR));
 
-	if ( ! $check || is_wp_error( $check ) ) {
+	if (!$check || is_wp_error($check)) {
 		return false;
 	}
 

brighty/wp-admin/includes/theme.php

Indentation +797 added lines, -797 removed lines

@@ -19,116 +19,116 @@ 
  *                            Null if filesystem credentials are required to proceed.
  */
 function delete_theme( $stylesheet, $redirect = '' ) {
-	global $wp_filesystem;
-
-	if ( empty( $stylesheet ) ) {
-		return false;
-	}
-
-	if ( empty( $redirect ) ) {
-		$redirect = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
-	}
-
-	ob_start();
-	$credentials = request_filesystem_credentials( $redirect );
-	$data        = ob_get_clean();
-
-	if ( false === $credentials ) {
-		if ( ! empty( $data ) ) {
-			require_once ABSPATH . 'wp-admin/admin-header.php';
-			echo $data;
-			require_once ABSPATH . 'wp-admin/admin-footer.php';
-			exit;
-		}
-		return;
-	}
-
-	if ( ! WP_Filesystem( $credentials ) ) {
-		ob_start();
-		// Failed to connect. Error and request again.
-		request_filesystem_credentials( $redirect, '', true );
-		$data = ob_get_clean();
-
-		if ( ! empty( $data ) ) {
-			require_once ABSPATH . 'wp-admin/admin-header.php';
-			echo $data;
-			require_once ABSPATH . 'wp-admin/admin-footer.php';
-			exit;
-		}
-		return;
-	}
-
-	if ( ! is_object( $wp_filesystem ) ) {
-		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
-	}
-
-	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
-		return new WP_Error( 'fs_error', __( 'Filesystem error.' ), $wp_filesystem->errors );
-	}
-
-	// Get the base plugin folder.
-	$themes_dir = $wp_filesystem->wp_themes_dir();
-	if ( empty( $themes_dir ) ) {
-		return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
-	}
-
-	/**
-	 * Fires immediately before a theme deletion attempt.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param string $stylesheet Stylesheet of the theme to delete.
-	 */
-	do_action( 'delete_theme', $stylesheet );
-
-	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir  = trailingslashit( $themes_dir . $stylesheet );
-	$deleted    = $wp_filesystem->delete( $theme_dir, true );
-
-	/**
-	 * Fires immediately after a theme deletion attempt.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param string $stylesheet Stylesheet of the theme to delete.
-	 * @param bool   $deleted    Whether the theme deletion was successful.
-	 */
-	do_action( 'deleted_theme', $stylesheet, $deleted );
-
-	if ( ! $deleted ) {
-		return new WP_Error(
-			'could_not_remove_theme',
-			/* translators: %s: Theme name. */
-			sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet )
-		);
-	}
-
-	$theme_translations = wp_get_installed_translations( 'themes' );
-
-	// Remove language files, silently.
-	if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
-		$translations = $theme_translations[ $stylesheet ];
-
-		foreach ( $translations as $translation => $data ) {
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
-
-			$json_translation_files = glob( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '-*.json' );
-			if ( $json_translation_files ) {
-				array_map( array( $wp_filesystem, 'delete' ), $json_translation_files );
-			}
-		}
-	}
-
-	// Remove the theme from allowed themes on the network.
-	if ( is_multisite() ) {
-		WP_Theme::network_disable_theme( $stylesheet );
-	}
-
-	// Force refresh of theme update information.
-	delete_site_transient( 'update_themes' );
-
-	return true;
+    global $wp_filesystem;
+
+    if ( empty( $stylesheet ) ) {
+        return false;
+    }
+
+    if ( empty( $redirect ) ) {
+        $redirect = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
+    }
+
+    ob_start();
+    $credentials = request_filesystem_credentials( $redirect );
+    $data        = ob_get_clean();
+
+    if ( false === $credentials ) {
+        if ( ! empty( $data ) ) {
+            require_once ABSPATH . 'wp-admin/admin-header.php';
+            echo $data;
+            require_once ABSPATH . 'wp-admin/admin-footer.php';
+            exit;
+        }
+        return;
+    }
+
+    if ( ! WP_Filesystem( $credentials ) ) {
+        ob_start();
+        // Failed to connect. Error and request again.
+        request_filesystem_credentials( $redirect, '', true );
+        $data = ob_get_clean();
+
+        if ( ! empty( $data ) ) {
+            require_once ABSPATH . 'wp-admin/admin-header.php';
+            echo $data;
+            require_once ABSPATH . 'wp-admin/admin-footer.php';
+            exit;
+        }
+        return;
+    }
+
+    if ( ! is_object( $wp_filesystem ) ) {
+        return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+    }
+
+    if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
+        return new WP_Error( 'fs_error', __( 'Filesystem error.' ), $wp_filesystem->errors );
+    }
+
+    // Get the base plugin folder.
+    $themes_dir = $wp_filesystem->wp_themes_dir();
+    if ( empty( $themes_dir ) ) {
+        return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+    }
+
+    /**
+     * Fires immediately before a theme deletion attempt.
+     *
+     * @since 5.8.0
+     *
+     * @param string $stylesheet Stylesheet of the theme to delete.
+     */
+    do_action( 'delete_theme', $stylesheet );
+
+    $themes_dir = trailingslashit( $themes_dir );
+    $theme_dir  = trailingslashit( $themes_dir . $stylesheet );
+    $deleted    = $wp_filesystem->delete( $theme_dir, true );
+
+    /**
+     * Fires immediately after a theme deletion attempt.
+     *
+     * @since 5.8.0
+     *
+     * @param string $stylesheet Stylesheet of the theme to delete.
+     * @param bool   $deleted    Whether the theme deletion was successful.
+     */
+    do_action( 'deleted_theme', $stylesheet, $deleted );
+
+    if ( ! $deleted ) {
+        return new WP_Error(
+            'could_not_remove_theme',
+            /* translators: %s: Theme name. */
+            sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet )
+        );
+    }
+
+    $theme_translations = wp_get_installed_translations( 'themes' );
+
+    // Remove language files, silently.
+    if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
+        $translations = $theme_translations[ $stylesheet ];
+
+        foreach ( $translations as $translation => $data ) {
+            $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
+            $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
+
+            $json_translation_files = glob( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '-*.json' );
+            if ( $json_translation_files ) {
+                array_map( array( $wp_filesystem, 'delete' ), $json_translation_files );
+            }
+        }
+    }
+
+    // Remove the theme from allowed themes on the network.
+    if ( is_multisite() ) {
+        WP_Theme::network_disable_theme( $stylesheet );
+    }
+
+    // Force refresh of theme update information.
+    delete_site_transient( 'update_themes' );
+
+    return true;
 }
 
 /**
@@ -142,7 +142,7 @@ 
  * @return string[] Array of template file names keyed by the template header name.
  */
 function get_page_templates( $post = null, $post_type = 'page' ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post, $post_type ) );
+    return array_flip( wp_get_theme()->get_page_templates( $post, $post_type ) );
 }
 
 /**
@@ -156,7 +156,7 @@ 
  * @return string
  */
 function _get_template_edit_filename( $fullpath, $containingfolder ) {
-	return str_replace( dirname( dirname( $containingfolder ) ), '', $fullpath );
+    return str_replace( dirname( dirname( $containingfolder ) ), '', $fullpath );
 }
 
 /**
@@ -171,7 +171,7 @@ 
  * @param WP_Theme $theme Theme data object.
  */
 function theme_update_available( $theme ) {
-	echo get_theme_update_available( $theme );
+    echo get_theme_update_available( $theme );
 }
 
 /**
@@ -185,89 +185,89 @@ 
  * @return string|false HTML for the update link, or false if invalid info was passed.
  */
 function get_theme_update_available( $theme ) {
-	static $themes_update = null;
-
-	if ( ! current_user_can( 'update_themes' ) ) {
-		return false;
-	}
-
-	if ( ! isset( $themes_update ) ) {
-		$themes_update = get_site_transient( 'update_themes' );
-	}
-
-	if ( ! ( $theme instanceof WP_Theme ) ) {
-		return false;
-	}
-
-	$stylesheet = $theme->get_stylesheet();
-
-	$html = '';
-
-	if ( isset( $themes_update->response[ $stylesheet ] ) ) {
-		$update      = $themes_update->response[ $stylesheet ];
-		$theme_name  = $theme->display( 'Name' );
-		$details_url = add_query_arg(
-			array(
-				'TB_iframe' => 'true',
-				'width'     => 1024,
-				'height'    => 800,
-			),
-			$update['url']
-		); // Theme browser inside WP? Replace this. Also, theme preview JS will override this on the available list.
-		$update_url  = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
-
-		if ( ! is_multisite() ) {
-			if ( ! current_user_can( 'update_themes' ) ) {
-				$html = sprintf(
-					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
-					$theme_name,
-					esc_url( $details_url ),
-					sprintf(
-						'class="thickbox open-plugin-details-modal" aria-label="%s"',
-						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
-					),
-					$update['new_version']
-				);
-			} elseif ( empty( $update['package'] ) ) {
-				$html = sprintf(
-					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
-					$theme_name,
-					esc_url( $details_url ),
-					sprintf(
-						'class="thickbox open-plugin-details-modal" aria-label="%s"',
-						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
-					),
-					$update['new_version']
-				);
-			} else {
-				$html = sprintf(
-					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
-					$theme_name,
-					esc_url( $details_url ),
-					sprintf(
-						'class="thickbox open-plugin-details-modal" aria-label="%s"',
-						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
-					),
-					$update['new_version'],
-					$update_url,
-					sprintf(
-						'aria-label="%s" id="update-theme" data-slug="%s"',
-						/* translators: %s: Theme name. */
-						esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme_name ) ),
-						$stylesheet
-					)
-				);
-			}
-		}
-	}
-
-	return $html;
+    static $themes_update = null;
+
+    if ( ! current_user_can( 'update_themes' ) ) {
+        return false;
+    }
+
+    if ( ! isset( $themes_update ) ) {
+        $themes_update = get_site_transient( 'update_themes' );
+    }
+
+    if ( ! ( $theme instanceof WP_Theme ) ) {
+        return false;
+    }
+
+    $stylesheet = $theme->get_stylesheet();
+
+    $html = '';
+
+    if ( isset( $themes_update->response[ $stylesheet ] ) ) {
+        $update      = $themes_update->response[ $stylesheet ];
+        $theme_name  = $theme->display( 'Name' );
+        $details_url = add_query_arg(
+            array(
+                'TB_iframe' => 'true',
+                'width'     => 1024,
+                'height'    => 800,
+            ),
+            $update['url']
+        ); // Theme browser inside WP? Replace this. Also, theme preview JS will override this on the available list.
+        $update_url  = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&amp;theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
+
+        if ( ! is_multisite() ) {
+            if ( ! current_user_can( 'update_themes' ) ) {
+                $html = sprintf(
+                    /* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
+                    '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+                    $theme_name,
+                    esc_url( $details_url ),
+                    sprintf(
+                        'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                        /* translators: 1: Theme name, 2: Version number. */
+                        esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+                    ),
+                    $update['new_version']
+                );
+            } elseif ( empty( $update['package'] ) ) {
+                $html = sprintf(
+                    /* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
+                    '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+                    $theme_name,
+                    esc_url( $details_url ),
+                    sprintf(
+                        'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                        /* translators: 1: Theme name, 2: Version number. */
+                        esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+                    ),
+                    $update['new_version']
+                );
+            } else {
+                $html = sprintf(
+                    /* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
+                    '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+                    $theme_name,
+                    esc_url( $details_url ),
+                    sprintf(
+                        'class="thickbox open-plugin-details-modal" aria-label="%s"',
+                        /* translators: 1: Theme name, 2: Version number. */
+                        esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+                    ),
+                    $update['new_version'],
+                    $update_url,
+                    sprintf(
+                        'aria-label="%s" id="update-theme" data-slug="%s"',
+                        /* translators: %s: Theme name. */
+                        esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme_name ) ),
+                        $stylesheet
+                    )
+                );
+            }
+        }
+    }
+
+    return $html;
 }
 
 /**
@@ -304,102 +304,102 @@ 
  * @return array Array of features keyed by category with translations keyed by slug.
  */
 function get_theme_feature_list( $api = true ) {
-	// Hard-coded list is used if API is not accessible.
-	$features = array(
-
-		__( 'Subject' )  => array(
-			'blog'           => __( 'Blog' ),
-			'e-commerce'     => __( 'E-Commerce' ),
-			'education'      => __( 'Education' ),
-			'entertainment'  => __( 'Entertainment' ),
-			'food-and-drink' => __( 'Food & Drink' ),
-			'holiday'        => __( 'Holiday' ),
-			'news'           => __( 'News' ),
-			'photography'    => __( 'Photography' ),
-			'portfolio'      => __( 'Portfolio' ),
-		),
-
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'block-patterns'        => __( 'Block Editor Patterns' ),
-			'block-styles'          => __( 'Block Editor Styles' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-logo'           => __( 'Custom Logo' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'footer-widgets'        => __( 'Footer Widgets' ),
-			'full-site-editing'     => __( 'Full Site Editing' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'template-editing'      => __( 'Template Editing' ),
-			'theme-options'         => __( 'Theme Options' ),
-		),
-
-		__( 'Layout' )   => array(
-			'grid-layout'   => __( 'Grid Layout' ),
-			'one-column'    => __( 'One Column' ),
-			'two-columns'   => __( 'Two Columns' ),
-			'three-columns' => __( 'Three Columns' ),
-			'four-columns'  => __( 'Four Columns' ),
-			'left-sidebar'  => __( 'Left Sidebar' ),
-			'right-sidebar' => __( 'Right Sidebar' ),
-			'wide-blocks'   => __( 'Wide Blocks' ),
-		),
-
-	);
-
-	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
-		return $features;
-	}
-
-	$feature_list = get_site_transient( 'wporg_theme_feature_list' );
-	if ( ! $feature_list ) {
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
-	}
-
-	if ( ! $feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) ) {
-			return $features;
-		}
-	}
-
-	if ( ! $feature_list ) {
-		return $features;
-	}
-
-	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
-
-	$category_translations = array(
-		'Layout'   => __( 'Layout' ),
-		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' ),
-	);
-
-	$wporg_features = array();
-
-	// Loop over the wp.org canonical list and apply translations.
-	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset( $category_translations[ $feature_category ] ) ) {
-			$feature_category = $category_translations[ $feature_category ];
-		}
-
-		$wporg_features[ $feature_category ] = array();
-
-		foreach ( $feature_items as $feature ) {
-			if ( isset( $features[ $feature_category ][ $feature ] ) ) {
-				$wporg_features[ $feature_category ][ $feature ] = $features[ $feature_category ][ $feature ];
-			} else {
-				$wporg_features[ $feature_category ][ $feature ] = $feature;
-			}
-		}
-	}
-
-	return $wporg_features;
+    // Hard-coded list is used if API is not accessible.
+    $features = array(
+
+        __( 'Subject' )  => array(
+            'blog'           => __( 'Blog' ),
+            'e-commerce'     => __( 'E-Commerce' ),
+            'education'      => __( 'Education' ),
+            'entertainment'  => __( 'Entertainment' ),
+            'food-and-drink' => __( 'Food & Drink' ),
+            'holiday'        => __( 'Holiday' ),
+            'news'           => __( 'News' ),
+            'photography'    => __( 'Photography' ),
+            'portfolio'      => __( 'Portfolio' ),
+        ),
+
+        __( 'Features' ) => array(
+            'accessibility-ready'   => __( 'Accessibility Ready' ),
+            'block-patterns'        => __( 'Block Editor Patterns' ),
+            'block-styles'          => __( 'Block Editor Styles' ),
+            'custom-background'     => __( 'Custom Background' ),
+            'custom-colors'         => __( 'Custom Colors' ),
+            'custom-header'         => __( 'Custom Header' ),
+            'custom-logo'           => __( 'Custom Logo' ),
+            'editor-style'          => __( 'Editor Style' ),
+            'featured-image-header' => __( 'Featured Image Header' ),
+            'featured-images'       => __( 'Featured Images' ),
+            'footer-widgets'        => __( 'Footer Widgets' ),
+            'full-site-editing'     => __( 'Full Site Editing' ),
+            'full-width-template'   => __( 'Full Width Template' ),
+            'post-formats'          => __( 'Post Formats' ),
+            'sticky-post'           => __( 'Sticky Post' ),
+            'template-editing'      => __( 'Template Editing' ),
+            'theme-options'         => __( 'Theme Options' ),
+        ),
+
+        __( 'Layout' )   => array(
+            'grid-layout'   => __( 'Grid Layout' ),
+            'one-column'    => __( 'One Column' ),
+            'two-columns'   => __( 'Two Columns' ),
+            'three-columns' => __( 'Three Columns' ),
+            'four-columns'  => __( 'Four Columns' ),
+            'left-sidebar'  => __( 'Left Sidebar' ),
+            'right-sidebar' => __( 'Right Sidebar' ),
+            'wide-blocks'   => __( 'Wide Blocks' ),
+        ),
+
+    );
+
+    if ( ! $api || ! current_user_can( 'install_themes' ) ) {
+        return $features;
+    }
+
+    $feature_list = get_site_transient( 'wporg_theme_feature_list' );
+    if ( ! $feature_list ) {
+        set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+    }
+
+    if ( ! $feature_list ) {
+        $feature_list = themes_api( 'feature_list', array() );
+        if ( is_wp_error( $feature_list ) ) {
+            return $features;
+        }
+    }
+
+    if ( ! $feature_list ) {
+        return $features;
+    }
+
+    set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+
+    $category_translations = array(
+        'Layout'   => __( 'Layout' ),
+        'Features' => __( 'Features' ),
+        'Subject'  => __( 'Subject' ),
+    );
+
+    $wporg_features = array();
+
+    // Loop over the wp.org canonical list and apply translations.
+    foreach ( (array) $feature_list as $feature_category => $feature_items ) {
+        if ( isset( $category_translations[ $feature_category ] ) ) {
+            $feature_category = $category_translations[ $feature_category ];
+        }
+
+        $wporg_features[ $feature_category ] = array();
+
+        foreach ( $feature_items as $feature ) {
+            if ( isset( $features[ $feature_category ][ $feature ] ) ) {
+                $wporg_features[ $feature_category ][ $feature ] = $features[ $feature_category ][ $feature ];
+            } else {
+                $wporg_features[ $feature_category ][ $feature ] = $feature;
+            }
+        }
+    }
+
+    return $wporg_features;
 }
 
 /**
@@ -484,150 +484,150 @@ 
  *         for more information on the make-up of possible return objects depending on the value of `$action`.
  */
 function themes_api( $action, $args = array() ) {
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-
-	if ( is_array( $args ) ) {
-		$args = (object) $args;
-	}
-
-	if ( 'query_themes' === $action ) {
-		if ( ! isset( $args->per_page ) ) {
-			$args->per_page = 24;
-		}
-	}
-
-	if ( ! isset( $args->locale ) ) {
-		$args->locale = get_user_locale();
-	}
-
-	if ( ! isset( $args->wp_version ) ) {
-		$args->wp_version = substr( $wp_version, 0, 3 ); // x.y
-	}
-
-	/**
-	 * Filters arguments used to query for installer pages from the WordPress.org Themes API.
-	 *
-	 * Important: An object MUST be returned to this filter.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param object $args   Arguments used to query for installer pages from the WordPress.org Themes API.
-	 * @param string $action Requested action. Likely values are 'theme_information',
-	 *                       'feature_list', or 'query_themes'.
-	 */
-	$args = apply_filters( 'themes_api_args', $args, $action );
-
-	/**
-	 * Filters whether to override the WordPress.org Themes API.
-	 *
-	 * Returning a non-false value will effectively short-circuit the WordPress.org API request.
-	 *
-	 * If `$action` is 'query_themes', 'theme_information', or 'feature_list', an object MUST
-	 * be passed. If `$action` is 'hot_tags', an array should be passed.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param false|object|array $override Whether to override the WordPress.org Themes API. Default false.
-	 * @param string             $action   Requested action. Likely values are 'theme_information',
-	 *                                    'feature_list', or 'query_themes'.
-	 * @param object             $args     Arguments used to query for installer pages from the Themes API.
-	 */
-	$res = apply_filters( 'themes_api', false, $action, $args );
-
-	if ( ! $res ) {
-		$url = 'http://api.wordpress.org/themes/info/1.2/';
-		$url = add_query_arg(
-			array(
-				'action'  => $action,
-				'request' => $args,
-			),
-			$url
-		);
-
-		$http_url = $url;
-		$ssl      = wp_http_supports( array( 'ssl' ) );
-		if ( $ssl ) {
-			$url = set_url_scheme( $url, 'https' );
-		}
-
-		$http_args = array(
-			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-		);
-		$request   = wp_remote_get( $url, $http_args );
-
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! wp_doing_ajax() ) {
-				trigger_error(
-					sprintf(
-						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
-					) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
-					headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
-				);
-			}
-			$request = wp_remote_get( $http_url, $http_args );
-		}
-
-		if ( is_wp_error( $request ) ) {
-			$res = new WP_Error(
-				'themes_api_failed',
-				sprintf(
-					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
-				),
-				$request->get_error_message()
-			);
-		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( is_array( $res ) ) {
-				// Object casting is required in order to match the info/1.0 format.
-				$res = (object) $res;
-			} elseif ( null === $res ) {
-				$res = new WP_Error(
-					'themes_api_failed',
-					sprintf(
-						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
-					),
-					wp_remote_retrieve_body( $request )
-				);
-			}
-
-			if ( isset( $res->error ) ) {
-				$res = new WP_Error( 'themes_api_failed', $res->error );
-			}
-		}
-
-		if ( ! is_wp_error( $res ) ) {
-			// Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
-			if ( 'query_themes' === $action ) {
-				foreach ( $res->themes as $i => $theme ) {
-					$res->themes[ $i ] = (object) $theme;
-				}
-			}
-
-			// Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
-			if ( 'feature_list' === $action ) {
-				$res = (array) $res;
-			}
-		}
-	}
-
-	/**
-	 * Filters the returned WordPress.org Themes API response.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param array|stdClass|WP_Error $res    WordPress.org Themes API response.
-	 * @param string                  $action Requested action. Likely values are 'theme_information',
-	 *                                        'feature_list', or 'query_themes'.
-	 * @param stdClass                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
-	 */
-	return apply_filters( 'themes_api_result', $res, $action, $args );
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+
+    if ( is_array( $args ) ) {
+        $args = (object) $args;
+    }
+
+    if ( 'query_themes' === $action ) {
+        if ( ! isset( $args->per_page ) ) {
+            $args->per_page = 24;
+        }
+    }
+
+    if ( ! isset( $args->locale ) ) {
+        $args->locale = get_user_locale();
+    }
+
+    if ( ! isset( $args->wp_version ) ) {
+        $args->wp_version = substr( $wp_version, 0, 3 ); // x.y
+    }
+
+    /**
+     * Filters arguments used to query for installer pages from the WordPress.org Themes API.
+     *
+     * Important: An object MUST be returned to this filter.
+     *
+     * @since 2.8.0
+     *
+     * @param object $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+     * @param string $action Requested action. Likely values are 'theme_information',
+     *                       'feature_list', or 'query_themes'.
+     */
+    $args = apply_filters( 'themes_api_args', $args, $action );
+
+    /**
+     * Filters whether to override the WordPress.org Themes API.
+     *
+     * Returning a non-false value will effectively short-circuit the WordPress.org API request.
+     *
+     * If `$action` is 'query_themes', 'theme_information', or 'feature_list', an object MUST
+     * be passed. If `$action` is 'hot_tags', an array should be passed.
+     *
+     * @since 2.8.0
+     *
+     * @param false|object|array $override Whether to override the WordPress.org Themes API. Default false.
+     * @param string             $action   Requested action. Likely values are 'theme_information',
+     *                                    'feature_list', or 'query_themes'.
+     * @param object             $args     Arguments used to query for installer pages from the Themes API.
+     */
+    $res = apply_filters( 'themes_api', false, $action, $args );
+
+    if ( ! $res ) {
+        $url = 'http://api.wordpress.org/themes/info/1.2/';
+        $url = add_query_arg(
+            array(
+                'action'  => $action,
+                'request' => $args,
+            ),
+            $url
+        );
+
+        $http_url = $url;
+        $ssl      = wp_http_supports( array( 'ssl' ) );
+        if ( $ssl ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $http_args = array(
+            'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+        );
+        $request   = wp_remote_get( $url, $http_args );
+
+        if ( $ssl && is_wp_error( $request ) ) {
+            if ( ! wp_doing_ajax() ) {
+                trigger_error(
+                    sprintf(
+                        /* translators: %s: Support forums URL. */
+                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                        __( 'https://wordpress.org/support/forums/' )
+                    ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+                    headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+                );
+            }
+            $request = wp_remote_get( $http_url, $http_args );
+        }
+
+        if ( is_wp_error( $request ) ) {
+            $res = new WP_Error(
+                'themes_api_failed',
+                sprintf(
+                    /* translators: %s: Support forums URL. */
+                    __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                    __( 'https://wordpress.org/support/forums/' )
+                ),
+                $request->get_error_message()
+            );
+        } else {
+            $res = json_decode( wp_remote_retrieve_body( $request ), true );
+            if ( is_array( $res ) ) {
+                // Object casting is required in order to match the info/1.0 format.
+                $res = (object) $res;
+            } elseif ( null === $res ) {
+                $res = new WP_Error(
+                    'themes_api_failed',
+                    sprintf(
+                        /* translators: %s: Support forums URL. */
+                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                        __( 'https://wordpress.org/support/forums/' )
+                    ),
+                    wp_remote_retrieve_body( $request )
+                );
+            }
+
+            if ( isset( $res->error ) ) {
+                $res = new WP_Error( 'themes_api_failed', $res->error );
+            }
+        }
+
+        if ( ! is_wp_error( $res ) ) {
+            // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
+            if ( 'query_themes' === $action ) {
+                foreach ( $res->themes as $i => $theme ) {
+                    $res->themes[ $i ] = (object) $theme;
+                }
+            }
+
+            // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
+            if ( 'feature_list' === $action ) {
+                $res = (array) $res;
+            }
+        }
+    }
+
+    /**
+     * Filters the returned WordPress.org Themes API response.
+     *
+     * @since 2.8.0
+     *
+     * @param array|stdClass|WP_Error $res    WordPress.org Themes API response.
+     * @param string                  $action Requested action. Likely values are 'theme_information',
+     *                                        'feature_list', or 'query_themes'.
+     * @param stdClass                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+     */
+    return apply_filters( 'themes_api_result', $res, $action, $args );
 }
 
 /**
@@ -641,168 +641,168 @@ 
  * @return array An associative array of theme data, sorted by name.
  */
 function wp_prepare_themes_for_js( $themes = null ) {
-	$current_theme = get_stylesheet();
-
-	/**
-	 * Filters theme data before it is prepared for JavaScript.
-	 *
-	 * Passing a non-empty array will result in wp_prepare_themes_for_js() returning
-	 * early with that value instead.
-	 *
-	 * @since 4.2.0
-	 *
-	 * @param array           $prepared_themes An associative array of theme data. Default empty array.
-	 * @param WP_Theme[]|null $themes          An array of theme objects to prepare, if any.
-	 * @param string          $current_theme   The active theme slug.
-	 */
-	$prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
-
-	if ( ! empty( $prepared_themes ) ) {
-		return $prepared_themes;
-	}
-
-	// Make sure the active theme is listed first.
-	$prepared_themes[ $current_theme ] = array();
-
-	if ( null === $themes ) {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
-		if ( ! isset( $themes[ $current_theme ] ) ) {
-			$themes[ $current_theme ] = wp_get_theme();
-		}
-	}
-
-	$updates    = array();
-	$no_updates = array();
-	if ( ! is_multisite() && current_user_can( 'update_themes' ) ) {
-		$updates_transient = get_site_transient( 'update_themes' );
-		if ( isset( $updates_transient->response ) ) {
-			$updates = $updates_transient->response;
-		}
-		if ( isset( $updates_transient->no_update ) ) {
-			$no_updates = $updates_transient->no_update;
-		}
-	}
-
-	WP_Theme::sort_by_name( $themes );
-
-	$parents = array();
-
-	$auto_updates = (array) get_site_option( 'auto_update_themes', array() );
-
-	foreach ( $themes as $theme ) {
-		$slug         = $theme->get_stylesheet();
-		$encoded_slug = urlencode( $slug );
-
-		$parent = false;
-		if ( $theme->parent() ) {
-			$parent           = $theme->parent();
-			$parents[ $slug ] = $parent->get_stylesheet();
-			$parent           = $parent->display( 'Name' );
-		}
-
-		$customize_action = null;
-
-		$can_edit_theme_options = current_user_can( 'edit_theme_options' );
-		$can_customize          = current_user_can( 'customize' );
-		$is_block_theme         = $theme->is_block_theme();
-
-		if ( $is_block_theme && $can_edit_theme_options ) {
-			$customize_action = esc_url( admin_url( 'site-editor.php' ) );
-		} elseif ( ! $is_block_theme && $can_customize && $can_edit_theme_options ) {
-			$customize_action = esc_url(
-				add_query_arg(
-					array(
-						'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
-					),
-					wp_customize_url( $slug )
-				)
-			);
-		}
-
-		$update_requires_wp  = isset( $updates[ $slug ]['requires'] ) ? $updates[ $slug ]['requires'] : null;
-		$update_requires_php = isset( $updates[ $slug ]['requires_php'] ) ? $updates[ $slug ]['requires_php'] : null;
-
-		$auto_update        = in_array( $slug, $auto_updates, true );
-		$auto_update_action = $auto_update ? 'disable-auto-update' : 'enable-auto-update';
-
-		if ( isset( $updates[ $slug ] ) ) {
-			$auto_update_supported      = true;
-			$auto_update_filter_payload = (object) $updates[ $slug ];
-		} elseif ( isset( $no_updates[ $slug ] ) ) {
-			$auto_update_supported      = true;
-			$auto_update_filter_payload = (object) $no_updates[ $slug ];
-		} else {
-			$auto_update_supported = false;
-			/*
+    $current_theme = get_stylesheet();
+
+    /**
+     * Filters theme data before it is prepared for JavaScript.
+     *
+     * Passing a non-empty array will result in wp_prepare_themes_for_js() returning
+     * early with that value instead.
+     *
+     * @since 4.2.0
+     *
+     * @param array           $prepared_themes An associative array of theme data. Default empty array.
+     * @param WP_Theme[]|null $themes          An array of theme objects to prepare, if any.
+     * @param string          $current_theme   The active theme slug.
+     */
+    $prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
+
+    if ( ! empty( $prepared_themes ) ) {
+        return $prepared_themes;
+    }
+
+    // Make sure the active theme is listed first.
+    $prepared_themes[ $current_theme ] = array();
+
+    if ( null === $themes ) {
+        $themes = wp_get_themes( array( 'allowed' => true ) );
+        if ( ! isset( $themes[ $current_theme ] ) ) {
+            $themes[ $current_theme ] = wp_get_theme();
+        }
+    }
+
+    $updates    = array();
+    $no_updates = array();
+    if ( ! is_multisite() && current_user_can( 'update_themes' ) ) {
+        $updates_transient = get_site_transient( 'update_themes' );
+        if ( isset( $updates_transient->response ) ) {
+            $updates = $updates_transient->response;
+        }
+        if ( isset( $updates_transient->no_update ) ) {
+            $no_updates = $updates_transient->no_update;
+        }
+    }
+
+    WP_Theme::sort_by_name( $themes );
+
+    $parents = array();
+
+    $auto_updates = (array) get_site_option( 'auto_update_themes', array() );
+
+    foreach ( $themes as $theme ) {
+        $slug         = $theme->get_stylesheet();
+        $encoded_slug = urlencode( $slug );
+
+        $parent = false;
+        if ( $theme->parent() ) {
+            $parent           = $theme->parent();
+            $parents[ $slug ] = $parent->get_stylesheet();
+            $parent           = $parent->display( 'Name' );
+        }
+
+        $customize_action = null;
+
+        $can_edit_theme_options = current_user_can( 'edit_theme_options' );
+        $can_customize          = current_user_can( 'customize' );
+        $is_block_theme         = $theme->is_block_theme();
+
+        if ( $is_block_theme && $can_edit_theme_options ) {
+            $customize_action = esc_url( admin_url( 'site-editor.php' ) );
+        } elseif ( ! $is_block_theme && $can_customize && $can_edit_theme_options ) {
+            $customize_action = esc_url(
+                add_query_arg(
+                    array(
+                        'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+                    ),
+                    wp_customize_url( $slug )
+                )
+            );
+        }
+
+        $update_requires_wp  = isset( $updates[ $slug ]['requires'] ) ? $updates[ $slug ]['requires'] : null;
+        $update_requires_php = isset( $updates[ $slug ]['requires_php'] ) ? $updates[ $slug ]['requires_php'] : null;
+
+        $auto_update        = in_array( $slug, $auto_updates, true );
+        $auto_update_action = $auto_update ? 'disable-auto-update' : 'enable-auto-update';
+
+        if ( isset( $updates[ $slug ] ) ) {
+            $auto_update_supported      = true;
+            $auto_update_filter_payload = (object) $updates[ $slug ];
+        } elseif ( isset( $no_updates[ $slug ] ) ) {
+            $auto_update_supported      = true;
+            $auto_update_filter_payload = (object) $no_updates[ $slug ];
+        } else {
+            $auto_update_supported = false;
+            /*
 			 * Create the expected payload for the auto_update_theme filter, this is the same data
 			 * as contained within $updates or $no_updates but used when the Theme is not known.
 			 */
-			$auto_update_filter_payload = (object) array(
-				'theme'        => $slug,
-				'new_version'  => $theme->get( 'Version' ),
-				'url'          => '',
-				'package'      => '',
-				'requires'     => $theme->get( 'RequiresWP' ),
-				'requires_php' => $theme->get( 'RequiresPHP' ),
-			);
-		}
-
-		$auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $auto_update_filter_payload );
-
-		$prepared_themes[ $slug ] = array(
-			'id'             => $slug,
-			'name'           => $theme->display( 'Name' ),
-			'screenshot'     => array( $theme->get_screenshot() ), // @todo Multiple screenshots.
-			'description'    => $theme->display( 'Description' ),
-			'author'         => $theme->display( 'Author', false, true ),
-			'authorAndUri'   => $theme->display( 'Author' ),
-			'tags'           => $theme->display( 'Tags' ),
-			'version'        => $theme->get( 'Version' ),
-			'compatibleWP'   => is_wp_version_compatible( $theme->get( 'RequiresWP' ) ),
-			'compatiblePHP'  => is_php_version_compatible( $theme->get( 'RequiresPHP' ) ),
-			'updateResponse' => array(
-				'compatibleWP'  => is_wp_version_compatible( $update_requires_wp ),
-				'compatiblePHP' => is_php_version_compatible( $update_requires_php ),
-			),
-			'parent'         => $parent,
-			'active'         => $slug === $current_theme,
-			'hasUpdate'      => isset( $updates[ $slug ] ),
-			'hasPackage'     => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
-			'update'         => get_theme_update_available( $theme ),
-			'autoupdate'     => array(
-				'enabled'   => $auto_update || $auto_update_forced,
-				'supported' => $auto_update_supported,
-				'forced'    => $auto_update_forced,
-			),
-			'actions'        => array(
-				'activate'   => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
-				'customize'  => $customize_action,
-				'delete'     => ( ! is_multisite() && current_user_can( 'delete_themes' ) ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
-				'autoupdate' => wp_is_auto_update_enabled_for_type( 'theme' ) && ! is_multisite() && current_user_can( 'update_themes' )
-					? wp_nonce_url( admin_url( 'themes.php?action=' . $auto_update_action . '&amp;stylesheet=' . $encoded_slug ), 'updates' )
-					: null,
-			),
-			'blockTheme'     => $theme->is_block_theme(),
-		);
-	}
-
-	// Remove 'delete' action if theme has an active child.
-	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
-		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
-	}
-
-	/**
-	 * Filters the themes prepared for JavaScript, for themes.php.
-	 *
-	 * Could be useful for changing the order, which is by name by default.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param array $prepared_themes Array of theme data.
-	 */
-	$prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
-	$prepared_themes = array_values( $prepared_themes );
-	return array_filter( $prepared_themes );
+            $auto_update_filter_payload = (object) array(
+                'theme'        => $slug,
+                'new_version'  => $theme->get( 'Version' ),
+                'url'          => '',
+                'package'      => '',
+                'requires'     => $theme->get( 'RequiresWP' ),
+                'requires_php' => $theme->get( 'RequiresPHP' ),
+            );
+        }
+
+        $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $auto_update_filter_payload );
+
+        $prepared_themes[ $slug ] = array(
+            'id'             => $slug,
+            'name'           => $theme->display( 'Name' ),
+            'screenshot'     => array( $theme->get_screenshot() ), // @todo Multiple screenshots.
+            'description'    => $theme->display( 'Description' ),
+            'author'         => $theme->display( 'Author', false, true ),
+            'authorAndUri'   => $theme->display( 'Author' ),
+            'tags'           => $theme->display( 'Tags' ),
+            'version'        => $theme->get( 'Version' ),
+            'compatibleWP'   => is_wp_version_compatible( $theme->get( 'RequiresWP' ) ),
+            'compatiblePHP'  => is_php_version_compatible( $theme->get( 'RequiresPHP' ) ),
+            'updateResponse' => array(
+                'compatibleWP'  => is_wp_version_compatible( $update_requires_wp ),
+                'compatiblePHP' => is_php_version_compatible( $update_requires_php ),
+            ),
+            'parent'         => $parent,
+            'active'         => $slug === $current_theme,
+            'hasUpdate'      => isset( $updates[ $slug ] ),
+            'hasPackage'     => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
+            'update'         => get_theme_update_available( $theme ),
+            'autoupdate'     => array(
+                'enabled'   => $auto_update || $auto_update_forced,
+                'supported' => $auto_update_supported,
+                'forced'    => $auto_update_forced,
+            ),
+            'actions'        => array(
+                'activate'   => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+                'customize'  => $customize_action,
+                'delete'     => ( ! is_multisite() && current_user_can( 'delete_themes' ) ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+                'autoupdate' => wp_is_auto_update_enabled_for_type( 'theme' ) && ! is_multisite() && current_user_can( 'update_themes' )
+                    ? wp_nonce_url( admin_url( 'themes.php?action=' . $auto_update_action . '&amp;stylesheet=' . $encoded_slug ), 'updates' )
+                    : null,
+            ),
+            'blockTheme'     => $theme->is_block_theme(),
+        );
+    }
+
+    // Remove 'delete' action if theme has an active child.
+    if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
+        unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+    }
+
+    /**
+     * Filters the themes prepared for JavaScript, for themes.php.
+     *
+     * Could be useful for changing the order, which is by name by default.
+     *
+     * @since 3.8.0
+     *
+     * @param array $prepared_themes Array of theme data.
+     */
+    $prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
+    $prepared_themes = array_values( $prepared_themes );
+    return array_filter( $prepared_themes );
 }
 
 /**
@@ -811,7 +811,7 @@ 
  * @since 4.2.0
  */
 function customize_themes_print_templates() {
-	?>
+    ?>
 	<script type="text/html" id="tmpl-customize-themes-details-view">
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap wp-clearfix" role="document">
@@ -835,15 +835,15 @@ 
 					<# } #>
 					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version">
 						<?php
-						/* translators: %s: Theme version. */
-						printf( __( 'Version: %s' ), '{{ data.version }}' );
-						?>
+                        /* translators: %s: Theme version. */
+                        printf( __( 'Version: %s' ), '{{ data.version }}' );
+                        ?>
 					</span></h2>
 					<h3 class="theme-author">
 						<?php
-						/* translators: %s: Theme author link. */
-						printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' );
-						?>
+                        /* translators: %s: Theme author link. */
+                        printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' );
+                        ?>
 					</h3>
 
 					<# if ( data.stars && 0 != data.num_ratings ) { #>
@@ -851,14 +851,14 @@ 
 							{{{ data.stars }}}
 							<a class="num-ratings" target="_blank" href="{{ data.reviews_url }}">
 								<?php
-								printf(
-									'%1$s <span class="screen-reader-text">%2$s</span>',
-									/* translators: %s: Number of ratings. */
-									sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' ),
-									/* translators: Accessibility text. */
-									__( '(opens in a new tab)' )
-								);
-								?>
+                                printf(
+                                    '%1$s <span class="screen-reader-text">%2$s</span>',
+                                    /* translators: %s: Number of ratings. */
+                                    sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' ),
+                                    /* translators: Accessibility text. */
+                                    __( '(opens in a new tab)' )
+                                );
+                                ?>
 							</a>
 						</div>
 					<# } #>
@@ -875,65 +875,65 @@ 
 								<p>
 									<# if ( ! data.updateResponse.compatibleWP && ! data.updateResponse.compatiblePHP ) { #>
 										<?php
-										printf(
-											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
-											'{{{ data.name }}}'
-										);
-										if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
-											printf(
-												/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-												' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-												self_admin_url( 'update-core.php' ),
-												esc_url( wp_get_update_php_url() )
-											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
-										} elseif ( current_user_can( 'update_core' ) ) {
-											printf(
-												/* translators: %s: URL to WordPress Updates screen. */
-												' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-												self_admin_url( 'update-core.php' )
-											);
-										} elseif ( current_user_can( 'update_php' ) ) {
-											printf(
-												/* translators: %s: URL to Update PHP page. */
-												' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-												esc_url( wp_get_update_php_url() )
-											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
-										}
-										?>
+                                        printf(
+                                            /* translators: %s: Theme name. */
+                                            __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
+                                            '{{{ data.name }}}'
+                                        );
+                                        if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+                                            printf(
+                                                /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
+                                                ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
+                                                self_admin_url( 'update-core.php' ),
+                                                esc_url( wp_get_update_php_url() )
+                                            );
+                                            wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                        } elseif ( current_user_can( 'update_core' ) ) {
+                                            printf(
+                                                /* translators: %s: URL to WordPress Updates screen. */
+                                                ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                                                self_admin_url( 'update-core.php' )
+                                            );
+                                        } elseif ( current_user_can( 'update_php' ) ) {
+                                            printf(
+                                                /* translators: %s: URL to Update PHP page. */
+                                                ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                                                esc_url( wp_get_update_php_url() )
+                                            );
+                                            wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                        }
+                                        ?>
 									<# } else if ( ! data.updateResponse.compatibleWP ) { #>
 										<?php
-										printf(
-											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
-											'{{{ data.name }}}'
-										);
-										if ( current_user_can( 'update_core' ) ) {
-											printf(
-												/* translators: %s: URL to WordPress Updates screen. */
-												' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-												self_admin_url( 'update-core.php' )
-											);
-										}
-										?>
+                                        printf(
+                                            /* translators: %s: Theme name. */
+                                            __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
+                                            '{{{ data.name }}}'
+                                        );
+                                        if ( current_user_can( 'update_core' ) ) {
+                                            printf(
+                                                /* translators: %s: URL to WordPress Updates screen. */
+                                                ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                                                self_admin_url( 'update-core.php' )
+                                            );
+                                        }
+                                        ?>
 									<# } else if ( ! data.updateResponse.compatiblePHP ) { #>
 										<?php
-										printf(
-											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
-											'{{{ data.name }}}'
-										);
-										if ( current_user_can( 'update_php' ) ) {
-											printf(
-												/* translators: %s: URL to Update PHP page. */
-												' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-												esc_url( wp_get_update_php_url() )
-											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
-										}
-										?>
+                                        printf(
+                                            /* translators: %s: Theme name. */
+                                            __( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
+                                            '{{{ data.name }}}'
+                                        );
+                                        if ( current_user_can( 'update_php' ) ) {
+                                            printf(
+                                                /* translators: %s: URL to Update PHP page. */
+                                                ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                                                esc_url( wp_get_update_php_url() )
+                                            );
+                                            wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                        }
+                                        ?>
 									<# } #>
 								</p>
 							</div>
@@ -943,12 +943,12 @@ 
 					<# if ( data.parent ) { #>
 						<p class="parent-theme">
 							<?php
-							printf(
-								/* translators: %s: Theme name. */
-								__( 'This is a child theme of %s.' ),
-								'<strong>{{{ data.parent }}}</strong>'
-							);
-							?>
+                            printf(
+                                /* translators: %s: Theme name. */
+                                __( 'This is a child theme of %s.' ),
+                                '<strong>{{{ data.parent }}}</strong>'
+                            );
+                            ?>
 						</p>
 					<# } #>
 
@@ -956,68 +956,68 @@ 
 						<div class="notice notice-error notice-alt notice-large"><p>
 							<# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #>
 								<?php
-								_e( 'This theme does not work with your versions of WordPress and PHP.' );
-								if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
-									printf(
-										/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-										' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-										self_admin_url( 'update-core.php' ),
-										esc_url( wp_get_update_php_url() )
-									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
-								} elseif ( current_user_can( 'update_core' ) ) {
-									printf(
-										/* translators: %s: URL to WordPress Updates screen. */
-										' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-										self_admin_url( 'update-core.php' )
-									);
-								} elseif ( current_user_can( 'update_php' ) ) {
-									printf(
-										/* translators: %s: URL to Update PHP page. */
-										' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-										esc_url( wp_get_update_php_url() )
-									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
-								}
-								?>
+                                _e( 'This theme does not work with your versions of WordPress and PHP.' );
+                                if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+                                    printf(
+                                        /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
+                                        ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
+                                        self_admin_url( 'update-core.php' ),
+                                        esc_url( wp_get_update_php_url() )
+                                    );
+                                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                } elseif ( current_user_can( 'update_core' ) ) {
+                                    printf(
+                                        /* translators: %s: URL to WordPress Updates screen. */
+                                        ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                                        self_admin_url( 'update-core.php' )
+                                    );
+                                } elseif ( current_user_can( 'update_php' ) ) {
+                                    printf(
+                                        /* translators: %s: URL to Update PHP page. */
+                                        ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                                        esc_url( wp_get_update_php_url() )
+                                    );
+                                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                }
+                                ?>
 							<# } else if ( ! data.compatibleWP ) { #>
 								<?php
-								_e( 'This theme does not work with your version of WordPress.' );
-								if ( current_user_can( 'update_core' ) ) {
-									printf(
-										/* translators: %s: URL to WordPress Updates screen. */
-										' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-										self_admin_url( 'update-core.php' )
-									);
-								}
-								?>
+                                _e( 'This theme does not work with your version of WordPress.' );
+                                if ( current_user_can( 'update_core' ) ) {
+                                    printf(
+                                        /* translators: %s: URL to WordPress Updates screen. */
+                                        ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
+                                        self_admin_url( 'update-core.php' )
+                                    );
+                                }
+                                ?>
 							<# } else if ( ! data.compatiblePHP ) { #>
 								<?php
-								_e( 'This theme does not work with your version of PHP.' );
-								if ( current_user_can( 'update_php' ) ) {
-									printf(
-										/* translators: %s: URL to Update PHP page. */
-										' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-										esc_url( wp_get_update_php_url() )
-									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
-								}
-								?>
+                                _e( 'This theme does not work with your version of PHP.' );
+                                if ( current_user_can( 'update_php' ) ) {
+                                    printf(
+                                        /* translators: %s: URL to Update PHP page. */
+                                        ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
+                                        esc_url( wp_get_update_php_url() )
+                                    );
+                                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                                }
+                                ?>
 							<# } #>
 						</p></div>
 					<# } else if ( ! data.active && data.blockTheme ) { #>
 						<div class="notice notice-error notice-alt notice-large"><p>
 						<?php
-							_e( 'This theme doesn\'t support Customizer.' );
-						?>
+                            _e( 'This theme doesn\'t support Customizer.' );
+                        ?>
 						<# if ( data.actions.activate ) { #>
 							<?php
-							printf(
-								/* translators: %s: URL to the themes page (also it activates the theme). */
-								' ' . __( 'However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.' ),
-								'{{{ data.actions.activate }}}'
-							);
-							?>
+                            printf(
+                                /* translators: %s: URL to the themes page (also it activates the theme). */
+                                ' ' . __( 'However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.' ),
+                                '{{{ data.actions.activate }}}'
+                            );
+                            ?>
 						<# } #>
 						</p></div>
 					<# } #>
@@ -1042,9 +1042,9 @@ 
 
 					<# if ( data.blockTheme ) { #>
 						<?php
-							/* translators: %s: Theme name. */
-							$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-						?>
+                            /* translators: %s: Theme name. */
+                            $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                        ?>
 						<# if ( data.compatibleWP && data.compatiblePHP && data.actions.activate ) { #>
 							<a href="{{{ data.actions.activate }}}" class="button button-primary activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
 						<# } #>
@@ -1084,15 +1084,15 @@ 
  * @return bool True, if in the list of paused themes. False, not in the list.
  */
 function is_theme_paused( $theme ) {
-	if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
-		return false;
-	}
+    if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
+        return false;
+    }
 
-	if ( get_stylesheet() !== $theme && get_template() !== $theme ) {
-		return false;
-	}
+    if ( get_stylesheet() !== $theme && get_template() !== $theme ) {
+        return false;
+    }
 
-	return array_key_exists( $theme, $GLOBALS['_paused_themes'] );
+    return array_key_exists( $theme, $GLOBALS['_paused_themes'] );
 }
 
 /**
@@ -1106,15 +1106,15 @@ 
  *                     `error_get_last()`, or false if none was recorded.
  */
 function wp_get_theme_error( $theme ) {
-	if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
-		return false;
-	}
+    if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
+        return false;
+    }
 
-	if ( ! array_key_exists( $theme, $GLOBALS['_paused_themes'] ) ) {
-		return false;
-	}
+    if ( ! array_key_exists( $theme, $GLOBALS['_paused_themes'] ) ) {
+        return false;
+    }
 
-	return $GLOBALS['_paused_themes'][ $theme ];
+    return $GLOBALS['_paused_themes'][ $theme ];
 }
 
 /**
@@ -1135,49 +1135,49 @@ 
  *                       `WP_Error` on failure.
  */
 function resume_theme( $theme, $redirect = '' ) {
-	list( $extension ) = explode( '/', $theme );
+    list( $extension ) = explode( '/', $theme );
 
-	/*
+    /*
 	 * We'll override this later if the theme could be resumed without
 	 * creating a fatal error.
 	 */
-	if ( ! empty( $redirect ) ) {
-		$functions_path = '';
-		if ( strpos( STYLESHEETPATH, $extension ) ) {
-			$functions_path = STYLESHEETPATH . '/functions.php';
-		} elseif ( strpos( TEMPLATEPATH, $extension ) ) {
-			$functions_path = TEMPLATEPATH . '/functions.php';
-		}
-
-		if ( ! empty( $functions_path ) ) {
-			wp_redirect(
-				add_query_arg(
-					'_error_nonce',
-					wp_create_nonce( 'theme-resume-error_' . $theme ),
-					$redirect
-				)
-			);
-
-			// Load the theme's functions.php to test whether it throws a fatal error.
-			ob_start();
-			if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
-				define( 'WP_SANDBOX_SCRAPING', true );
-			}
-			include $functions_path;
-			ob_clean();
-		}
-	}
-
-	$result = wp_paused_themes()->delete( $extension );
-
-	if ( ! $result ) {
-		return new WP_Error(
-			'could_not_resume_theme',
-			__( 'Could not resume the theme.' )
-		);
-	}
-
-	return true;
+    if ( ! empty( $redirect ) ) {
+        $functions_path = '';
+        if ( strpos( STYLESHEETPATH, $extension ) ) {
+            $functions_path = STYLESHEETPATH . '/functions.php';
+        } elseif ( strpos( TEMPLATEPATH, $extension ) ) {
+            $functions_path = TEMPLATEPATH . '/functions.php';
+        }
+
+        if ( ! empty( $functions_path ) ) {
+            wp_redirect(
+                add_query_arg(
+                    '_error_nonce',
+                    wp_create_nonce( 'theme-resume-error_' . $theme ),
+                    $redirect
+                )
+            );
+
+            // Load the theme's functions.php to test whether it throws a fatal error.
+            ob_start();
+            if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
+                define( 'WP_SANDBOX_SCRAPING', true );
+            }
+            include $functions_path;
+            ob_clean();
+        }
+    }
+
+    $result = wp_paused_themes()->delete( $extension );
+
+    if ( ! $result ) {
+        return new WP_Error(
+            'could_not_resume_theme',
+            __( 'Could not resume the theme.' )
+        );
+    }
+
+    return true;
 }
 
 /**
@@ -1188,23 +1188,23 @@ 
  * @global string $pagenow The filename of the current screen.
  */
 function paused_themes_notice() {
-	if ( 'themes.php' === $GLOBALS['pagenow'] ) {
-		return;
-	}
-
-	if ( ! current_user_can( 'resume_themes' ) ) {
-		return;
-	}
-
-	if ( ! isset( $GLOBALS['_paused_themes'] ) || empty( $GLOBALS['_paused_themes'] ) ) {
-		return;
-	}
-
-	printf(
-		'<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
-		__( 'One or more themes failed to load properly.' ),
-		__( 'You can find more details and make changes on the Themes screen.' ),
-		esc_url( admin_url( 'themes.php' ) ),
-		__( 'Go to the Themes screen' )
-	);
+    if ( 'themes.php' === $GLOBALS['pagenow'] ) {
+        return;
+    }
+
+    if ( ! current_user_can( 'resume_themes' ) ) {
+        return;
+    }
+
+    if ( ! isset( $GLOBALS['_paused_themes'] ) || empty( $GLOBALS['_paused_themes'] ) ) {
+        return;
+    }
+
+    printf(
+        '<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
+        __( 'One or more themes failed to load properly.' ),
+        __( 'You can find more details and make changes on the Themes screen.' ),
+        esc_url( admin_url( 'themes.php' ) ),
+        __( 'Go to the Themes screen' )
+    );
 }

Spacing +316 added lines, -316 removed lines

@@ -18,23 +18,23 @@ 
  * @return bool|null|WP_Error True on success, false if `$stylesheet` is empty, WP_Error on failure.
  *                            Null if filesystem credentials are required to proceed.
  */
-function delete_theme( $stylesheet, $redirect = '' ) {
+function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty( $stylesheet ) ) {
+	if (empty($stylesheet)) {
 		return false;
 	}
 
-	if ( empty( $redirect ) ) {
-		$redirect = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
+	if (empty($redirect)) {
+		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode($stylesheet), 'delete-theme_' . $stylesheet);
 	}
 
 	ob_start();
-	$credentials = request_filesystem_credentials( $redirect );
+	$credentials = request_filesystem_credentials($redirect);
 	$data        = ob_get_clean();
 
-	if ( false === $credentials ) {
-		if ( ! empty( $data ) ) {
+	if (false === $credentials) {
+		if (!empty($data)) {
 			require_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data;
 			require_once ABSPATH . 'wp-admin/admin-footer.php';
@@ -43,13 +43,13 @@ 
 		return;
 	}
 
-	if ( ! WP_Filesystem( $credentials ) ) {
+	if (!WP_Filesystem($credentials)) {
 		ob_start();
 		// Failed to connect. Error and request again.
-		request_filesystem_credentials( $redirect, '', true );
+		request_filesystem_credentials($redirect, '', true);
 		$data = ob_get_clean();
 
-		if ( ! empty( $data ) ) {
+		if (!empty($data)) {
 			require_once ABSPATH . 'wp-admin/admin-header.php';
 			echo $data;
 			require_once ABSPATH . 'wp-admin/admin-footer.php';
@@ -58,18 +58,18 @@ 
 		return;
 	}
 
-	if ( ! is_object( $wp_filesystem ) ) {
-		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+	if (!is_object($wp_filesystem)) {
+		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 	}
 
-	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->has_errors() ) {
-		return new WP_Error( 'fs_error', __( 'Filesystem error.' ), $wp_filesystem->errors );
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->has_errors()) {
+		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 	}
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
-	if ( empty( $themes_dir ) ) {
-		return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+	if (empty($themes_dir)) {
+		return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
 	}
 
 	/**
@@ -79,11 +79,11 @@ 
 	 *
 	 * @param string $stylesheet Stylesheet of the theme to delete.
 	 */
-	do_action( 'delete_theme', $stylesheet );
+	do_action('delete_theme', $stylesheet);
 
-	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir  = trailingslashit( $themes_dir . $stylesheet );
-	$deleted    = $wp_filesystem->delete( $theme_dir, true );
+	$themes_dir = trailingslashit($themes_dir);
+	$theme_dir  = trailingslashit($themes_dir . $stylesheet);
+	$deleted    = $wp_filesystem->delete($theme_dir, true);
 
 	/**
 	 * Fires immediately after a theme deletion attempt.
@@ -93,40 +93,40 @@ 
 	 * @param string $stylesheet Stylesheet of the theme to delete.
 	 * @param bool   $deleted    Whether the theme deletion was successful.
 	 */
-	do_action( 'deleted_theme', $stylesheet, $deleted );
+	do_action('deleted_theme', $stylesheet, $deleted);
 
-	if ( ! $deleted ) {
+	if (!$deleted) {
 		return new WP_Error(
 			'could_not_remove_theme',
 			/* translators: %s: Theme name. */
-			sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet )
+			sprintf(__('Could not fully remove the theme %s.'), $stylesheet)
 		);
 	}
 
-	$theme_translations = wp_get_installed_translations( 'themes' );
+	$theme_translations = wp_get_installed_translations('themes');
 
 	// Remove language files, silently.
-	if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
-		$translations = $theme_translations[ $stylesheet ];
+	if (!empty($theme_translations[$stylesheet])) {
+		$translations = $theme_translations[$stylesheet];
 
-		foreach ( $translations as $translation => $data ) {
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
+		foreach ($translations as $translation => $data) {
+			$wp_filesystem->delete(WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po');
+			$wp_filesystem->delete(WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo');
 
-			$json_translation_files = glob( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '-*.json' );
-			if ( $json_translation_files ) {
-				array_map( array( $wp_filesystem, 'delete' ), $json_translation_files );
+			$json_translation_files = glob(WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '-*.json');
+			if ($json_translation_files) {
+				array_map(array($wp_filesystem, 'delete'), $json_translation_files);
 			}
 		}
 	}
 
 	// Remove the theme from allowed themes on the network.
-	if ( is_multisite() ) {
-		WP_Theme::network_disable_theme( $stylesheet );
+	if (is_multisite()) {
+		WP_Theme::network_disable_theme($stylesheet);
 	}
 
 	// Force refresh of theme update information.
-	delete_site_transient( 'update_themes' );
+	delete_site_transient('update_themes');
 
 	return true;
 }
@@ -141,8 +141,8 @@ 
  * @param string       $post_type Optional. Post type to get the templates for. Default 'page'.
  * @return string[] Array of template file names keyed by the template header name.
  */
-function get_page_templates( $post = null, $post_type = 'page' ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post, $post_type ) );
+function get_page_templates($post = null, $post_type = 'page') {
+	return array_flip(wp_get_theme()->get_page_templates($post, $post_type));
 }
 
 /**
@@ -155,8 +155,8 @@ 
  * @param string $containingfolder Path of the theme parent folder
  * @return string
  */
-function _get_template_edit_filename( $fullpath, $containingfolder ) {
-	return str_replace( dirname( dirname( $containingfolder ) ), '', $fullpath );
+function _get_template_edit_filename($fullpath, $containingfolder) {
+	return str_replace(dirname(dirname($containingfolder)), '', $fullpath);
 }
 
 /**
@@ -170,8 +170,8 @@ 
  *
  * @param WP_Theme $theme Theme data object.
  */
-function theme_update_available( $theme ) {
-	echo get_theme_update_available( $theme );
+function theme_update_available($theme) {
+	echo get_theme_update_available($theme);
 }
 
 /**
@@ -184,18 +184,18 @@ 
  * @param WP_Theme $theme WP_Theme object.
  * @return string|false HTML for the update link, or false if invalid info was passed.
  */
-function get_theme_update_available( $theme ) {
+function get_theme_update_available($theme) {
 	static $themes_update = null;
 
-	if ( ! current_user_can( 'update_themes' ) ) {
+	if (!current_user_can('update_themes')) {
 		return false;
 	}
 
-	if ( ! isset( $themes_update ) ) {
-		$themes_update = get_site_transient( 'update_themes' );
+	if (!isset($themes_update)) {
+		$themes_update = get_site_transient('update_themes');
 	}
 
-	if ( ! ( $theme instanceof WP_Theme ) ) {
+	if (!($theme instanceof WP_Theme)) {
 		return false;
 	}
 
@@ -203,9 +203,9 @@ 
 
 	$html = '';
 
-	if ( isset( $themes_update->response[ $stylesheet ] ) ) {
-		$update      = $themes_update->response[ $stylesheet ];
-		$theme_name  = $theme->display( 'Name' );
+	if (isset($themes_update->response[$stylesheet])) {
+		$update      = $themes_update->response[$stylesheet];
+		$theme_name  = $theme->display('Name');
 		$details_url = add_query_arg(
 			array(
 				'TB_iframe' => 'true',
@@ -214,52 +214,52 @@ 
 			),
 			$update['url']
 		); // Theme browser inside WP? Replace this. Also, theme preview JS will override this on the available list.
-		$update_url  = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
+		$update_url = wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet)), 'upgrade-theme_' . $stylesheet);
 
-		if ( ! is_multisite() ) {
-			if ( ! current_user_can( 'update_themes' ) ) {
+		if (!is_multisite()) {
+			if (!current_user_can('update_themes')) {
 				$html = sprintf(
 					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+					'<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.') . '</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					sprintf(
 						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version']
 				);
-			} elseif ( empty( $update['package'] ) ) {
+			} elseif (empty($update['package'])) {
 				$html = sprintf(
 					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+					'<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					sprintf(
 						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version']
 				);
 			} else {
 				$html = sprintf(
 					/* translators: 1: Theme name, 2: Theme details URL, 3: Additional link attributes, 4: Version number, 5: Update URL, 6: Additional link attributes. */
-					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+					'<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.') . '</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					sprintf(
 						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: Theme name, 2: Version number. */
-						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+						esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version']))
 					),
 					$update['new_version'],
 					$update_url,
 					sprintf(
 						'aria-label="%s" id="update-theme" data-slug="%s"',
 						/* translators: %s: Theme name. */
-						esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme_name ) ),
+						esc_attr(sprintf(_x('Update %s now', 'theme'), $theme_name)),
 						$stylesheet
 					)
 				);
@@ -303,98 +303,98 @@ 
  * @param bool $api Optional. Whether try to fetch tags from the WordPress.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
  */
-function get_theme_feature_list( $api = true ) {
+function get_theme_feature_list($api = true) {
 	// Hard-coded list is used if API is not accessible.
 	$features = array(
 
-		__( 'Subject' )  => array(
-			'blog'           => __( 'Blog' ),
-			'e-commerce'     => __( 'E-Commerce' ),
-			'education'      => __( 'Education' ),
-			'entertainment'  => __( 'Entertainment' ),
-			'food-and-drink' => __( 'Food & Drink' ),
-			'holiday'        => __( 'Holiday' ),
-			'news'           => __( 'News' ),
-			'photography'    => __( 'Photography' ),
-			'portfolio'      => __( 'Portfolio' ),
+		__('Subject')  => array(
+			'blog'           => __('Blog'),
+			'e-commerce'     => __('E-Commerce'),
+			'education'      => __('Education'),
+			'entertainment'  => __('Entertainment'),
+			'food-and-drink' => __('Food & Drink'),
+			'holiday'        => __('Holiday'),
+			'news'           => __('News'),
+			'photography'    => __('Photography'),
+			'portfolio'      => __('Portfolio'),
 		),
 
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'block-patterns'        => __( 'Block Editor Patterns' ),
-			'block-styles'          => __( 'Block Editor Styles' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-logo'           => __( 'Custom Logo' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'footer-widgets'        => __( 'Footer Widgets' ),
-			'full-site-editing'     => __( 'Full Site Editing' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'template-editing'      => __( 'Template Editing' ),
-			'theme-options'         => __( 'Theme Options' ),
+		__('Features') => array(
+			'accessibility-ready'   => __('Accessibility Ready'),
+			'block-patterns'        => __('Block Editor Patterns'),
+			'block-styles'          => __('Block Editor Styles'),
+			'custom-background'     => __('Custom Background'),
+			'custom-colors'         => __('Custom Colors'),
+			'custom-header'         => __('Custom Header'),
+			'custom-logo'           => __('Custom Logo'),
+			'editor-style'          => __('Editor Style'),
+			'featured-image-header' => __('Featured Image Header'),
+			'featured-images'       => __('Featured Images'),
+			'footer-widgets'        => __('Footer Widgets'),
+			'full-site-editing'     => __('Full Site Editing'),
+			'full-width-template'   => __('Full Width Template'),
+			'post-formats'          => __('Post Formats'),
+			'sticky-post'           => __('Sticky Post'),
+			'template-editing'      => __('Template Editing'),
+			'theme-options'         => __('Theme Options'),
 		),
 
-		__( 'Layout' )   => array(
-			'grid-layout'   => __( 'Grid Layout' ),
-			'one-column'    => __( 'One Column' ),
-			'two-columns'   => __( 'Two Columns' ),
-			'three-columns' => __( 'Three Columns' ),
-			'four-columns'  => __( 'Four Columns' ),
-			'left-sidebar'  => __( 'Left Sidebar' ),
-			'right-sidebar' => __( 'Right Sidebar' ),
-			'wide-blocks'   => __( 'Wide Blocks' ),
+		__('Layout')   => array(
+			'grid-layout'   => __('Grid Layout'),
+			'one-column'    => __('One Column'),
+			'two-columns'   => __('Two Columns'),
+			'three-columns' => __('Three Columns'),
+			'four-columns'  => __('Four Columns'),
+			'left-sidebar'  => __('Left Sidebar'),
+			'right-sidebar' => __('Right Sidebar'),
+			'wide-blocks'   => __('Wide Blocks'),
 		),
 
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
+	if (!$api || !current_user_can('install_themes')) {
 		return $features;
 	}
 
-	$feature_list = get_site_transient( 'wporg_theme_feature_list' );
-	if ( ! $feature_list ) {
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	$feature_list = get_site_transient('wporg_theme_feature_list');
+	if (!$feature_list) {
+		set_site_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 	}
 
-	if ( ! $feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) ) {
+	if (!$feature_list) {
+		$feature_list = themes_api('feature_list', array());
+		if (is_wp_error($feature_list)) {
 			return $features;
 		}
 	}
 
-	if ( ! $feature_list ) {
+	if (!$feature_list) {
 		return $features;
 	}
 
-	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_site_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	$category_translations = array(
-		'Layout'   => __( 'Layout' ),
-		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' ),
+		'Layout'   => __('Layout'),
+		'Features' => __('Features'),
+		'Subject'  => __('Subject'),
 	);
 
 	$wporg_features = array();
 
 	// Loop over the wp.org canonical list and apply translations.
-	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset( $category_translations[ $feature_category ] ) ) {
-			$feature_category = $category_translations[ $feature_category ];
+	foreach ((array) $feature_list as $feature_category => $feature_items) {
+		if (isset($category_translations[$feature_category])) {
+			$feature_category = $category_translations[$feature_category];
 		}
 
-		$wporg_features[ $feature_category ] = array();
+		$wporg_features[$feature_category] = array();
 
-		foreach ( $feature_items as $feature ) {
-			if ( isset( $features[ $feature_category ][ $feature ] ) ) {
-				$wporg_features[ $feature_category ][ $feature ] = $features[ $feature_category ][ $feature ];
+		foreach ($feature_items as $feature) {
+			if (isset($features[$feature_category][$feature])) {
+				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
 			} else {
-				$wporg_features[ $feature_category ][ $feature ] = $feature;
+				$wporg_features[$feature_category][$feature] = $feature;
 			}
 		}
 	}
@@ -483,26 +483,26 @@ 
  *         {@link https://developer.wordpress.org/reference/functions/themes_api/ function reference article}
  *         for more information on the make-up of possible return objects depending on the value of `$action`.
  */
-function themes_api( $action, $args = array() ) {
+function themes_api($action, $args = array()) {
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( 'query_themes' === $action ) {
-		if ( ! isset( $args->per_page ) ) {
+	if ('query_themes' === $action) {
+		if (!isset($args->per_page)) {
 			$args->per_page = 24;
 		}
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if (!isset($args->locale)) {
 		$args->locale = get_user_locale();
 	}
 
-	if ( ! isset( $args->wp_version ) ) {
-		$args->wp_version = substr( $wp_version, 0, 3 ); // x.y
+	if (!isset($args->wp_version)) {
+		$args->wp_version = substr($wp_version, 0, 3); // x.y
 	}
 
 	/**
@@ -516,7 +516,7 @@ 
 	 * @param string $action Requested action. Likely values are 'theme_information',
 	 *                       'feature_list', or 'query_themes'.
 	 */
-	$args = apply_filters( 'themes_api_args', $args, $action );
+	$args = apply_filters('themes_api_args', $args, $action);
 
 	/**
 	 * Filters whether to override the WordPress.org Themes API.
@@ -533,9 +533,9 @@ 
 	 *                                    'feature_list', or 'query_themes'.
 	 * @param object             $args     Arguments used to query for installer pages from the Themes API.
 	 */
-	$res = apply_filters( 'themes_api', false, $action, $args );
+	$res = apply_filters('themes_api', false, $action, $args);
 
-	if ( ! $res ) {
+	if (!$res) {
 		$url = 'http://api.wordpress.org/themes/info/1.2/';
 		$url = add_query_arg(
 			array(
@@ -546,72 +546,72 @@ 
 		);
 
 		$http_url = $url;
-		$ssl      = wp_http_supports( array( 'ssl' ) );
-		if ( $ssl ) {
-			$url = set_url_scheme( $url, 'https' );
+		$ssl      = wp_http_supports(array('ssl'));
+		if ($ssl) {
+			$url = set_url_scheme($url, 'https');
 		}
 
 		$http_args = array(
-			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url('/'),
 		);
-		$request   = wp_remote_get( $url, $http_args );
+		$request   = wp_remote_get($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! wp_doing_ajax() ) {
+		if ($ssl && is_wp_error($request)) {
+			if (!wp_doing_ajax()) {
 				trigger_error(
 					sprintf(
 						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
-					) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+						__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+						__('https://wordpress.org/support/forums/')
+					) . ' ' . __('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'),
 					headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 				);
 			}
-			$request = wp_remote_get( $http_url, $http_args );
+			$request = wp_remote_get($http_url, $http_args);
 		}
 
-		if ( is_wp_error( $request ) ) {
+		if (is_wp_error($request)) {
 			$res = new WP_Error(
 				'themes_api_failed',
 				sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
+					__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+					__('https://wordpress.org/support/forums/')
 				),
 				$request->get_error_message()
 			);
 		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( is_array( $res ) ) {
+			$res = json_decode(wp_remote_retrieve_body($request), true);
+			if (is_array($res)) {
 				// Object casting is required in order to match the info/1.0 format.
 				$res = (object) $res;
-			} elseif ( null === $res ) {
+			} elseif (null === $res) {
 				$res = new WP_Error(
 					'themes_api_failed',
 					sprintf(
 						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
+						__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+						__('https://wordpress.org/support/forums/')
 					),
-					wp_remote_retrieve_body( $request )
+					wp_remote_retrieve_body($request)
 				);
 			}
 
-			if ( isset( $res->error ) ) {
-				$res = new WP_Error( 'themes_api_failed', $res->error );
+			if (isset($res->error)) {
+				$res = new WP_Error('themes_api_failed', $res->error);
 			}
 		}
 
-		if ( ! is_wp_error( $res ) ) {
+		if (!is_wp_error($res)) {
 			// Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
-			if ( 'query_themes' === $action ) {
-				foreach ( $res->themes as $i => $theme ) {
-					$res->themes[ $i ] = (object) $theme;
+			if ('query_themes' === $action) {
+				foreach ($res->themes as $i => $theme) {
+					$res->themes[$i] = (object) $theme;
 				}
 			}
 
 			// Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
-			if ( 'feature_list' === $action ) {
+			if ('feature_list' === $action) {
 				$res = (array) $res;
 			}
 		}
@@ -627,7 +627,7 @@ 
 	 *                                        'feature_list', or 'query_themes'.
 	 * @param stdClass                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
-	return apply_filters( 'themes_api_result', $res, $action, $args );
+	return apply_filters('themes_api_result', $res, $action, $args);
 }
 
 /**
@@ -640,7 +640,7 @@ 
  *
  * @return array An associative array of theme data, sorted by name.
  */
-function wp_prepare_themes_for_js( $themes = null ) {
+function wp_prepare_themes_for_js($themes = null) {
 	$current_theme = get_stylesheet();
 
 	/**
@@ -655,82 +655,82 @@ 
 	 * @param WP_Theme[]|null $themes          An array of theme objects to prepare, if any.
 	 * @param string          $current_theme   The active theme slug.
 	 */
-	$prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
+	$prepared_themes = (array) apply_filters('pre_prepare_themes_for_js', array(), $themes, $current_theme);
 
-	if ( ! empty( $prepared_themes ) ) {
+	if (!empty($prepared_themes)) {
 		return $prepared_themes;
 	}
 
 	// Make sure the active theme is listed first.
-	$prepared_themes[ $current_theme ] = array();
+	$prepared_themes[$current_theme] = array();
 
-	if ( null === $themes ) {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
-		if ( ! isset( $themes[ $current_theme ] ) ) {
-			$themes[ $current_theme ] = wp_get_theme();
+	if (null === $themes) {
+		$themes = wp_get_themes(array('allowed' => true));
+		if (!isset($themes[$current_theme])) {
+			$themes[$current_theme] = wp_get_theme();
 		}
 	}
 
 	$updates    = array();
 	$no_updates = array();
-	if ( ! is_multisite() && current_user_can( 'update_themes' ) ) {
-		$updates_transient = get_site_transient( 'update_themes' );
-		if ( isset( $updates_transient->response ) ) {
+	if (!is_multisite() && current_user_can('update_themes')) {
+		$updates_transient = get_site_transient('update_themes');
+		if (isset($updates_transient->response)) {
 			$updates = $updates_transient->response;
 		}
-		if ( isset( $updates_transient->no_update ) ) {
+		if (isset($updates_transient->no_update)) {
 			$no_updates = $updates_transient->no_update;
 		}
 	}
 
-	WP_Theme::sort_by_name( $themes );
+	WP_Theme::sort_by_name($themes);
 
 	$parents = array();
 
-	$auto_updates = (array) get_site_option( 'auto_update_themes', array() );
+	$auto_updates = (array) get_site_option('auto_update_themes', array());
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$slug         = $theme->get_stylesheet();
-		$encoded_slug = urlencode( $slug );
+		$encoded_slug = urlencode($slug);
 
 		$parent = false;
-		if ( $theme->parent() ) {
+		if ($theme->parent()) {
 			$parent           = $theme->parent();
-			$parents[ $slug ] = $parent->get_stylesheet();
-			$parent           = $parent->display( 'Name' );
+			$parents[$slug] = $parent->get_stylesheet();
+			$parent           = $parent->display('Name');
 		}
 
 		$customize_action = null;
 
-		$can_edit_theme_options = current_user_can( 'edit_theme_options' );
-		$can_customize          = current_user_can( 'customize' );
+		$can_edit_theme_options = current_user_can('edit_theme_options');
+		$can_customize          = current_user_can('customize');
 		$is_block_theme         = $theme->is_block_theme();
 
-		if ( $is_block_theme && $can_edit_theme_options ) {
-			$customize_action = esc_url( admin_url( 'site-editor.php' ) );
-		} elseif ( ! $is_block_theme && $can_customize && $can_edit_theme_options ) {
+		if ($is_block_theme && $can_edit_theme_options) {
+			$customize_action = esc_url(admin_url('site-editor.php'));
+		} elseif (!$is_block_theme && $can_customize && $can_edit_theme_options) {
 			$customize_action = esc_url(
 				add_query_arg(
 					array(
-						'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+						'return' => urlencode(esc_url_raw(remove_query_arg(wp_removable_query_args(), wp_unslash($_SERVER['REQUEST_URI'])))),
 					),
-					wp_customize_url( $slug )
+					wp_customize_url($slug)
 				)
 			);
 		}
 
-		$update_requires_wp  = isset( $updates[ $slug ]['requires'] ) ? $updates[ $slug ]['requires'] : null;
-		$update_requires_php = isset( $updates[ $slug ]['requires_php'] ) ? $updates[ $slug ]['requires_php'] : null;
+		$update_requires_wp  = isset($updates[$slug]['requires']) ? $updates[$slug]['requires'] : null;
+		$update_requires_php = isset($updates[$slug]['requires_php']) ? $updates[$slug]['requires_php'] : null;
 
-		$auto_update        = in_array( $slug, $auto_updates, true );
+		$auto_update        = in_array($slug, $auto_updates, true);
 		$auto_update_action = $auto_update ? 'disable-auto-update' : 'enable-auto-update';
 
-		if ( isset( $updates[ $slug ] ) ) {
+		if (isset($updates[$slug])) {
 			$auto_update_supported      = true;
-			$auto_update_filter_payload = (object) $updates[ $slug ];
-		} elseif ( isset( $no_updates[ $slug ] ) ) {
+			$auto_update_filter_payload = (object) $updates[$slug];
+		} elseif (isset($no_updates[$slug])) {
 			$auto_update_supported      = true;
-			$auto_update_filter_payload = (object) $no_updates[ $slug ];
+			$auto_update_filter_payload = (object) $no_updates[$slug];
 		} else {
 			$auto_update_supported = false;
 			/*
@@ -739,47 +739,47 @@ 
 			 */
 			$auto_update_filter_payload = (object) array(
 				'theme'        => $slug,
-				'new_version'  => $theme->get( 'Version' ),
+				'new_version'  => $theme->get('Version'),
 				'url'          => '',
 				'package'      => '',
-				'requires'     => $theme->get( 'RequiresWP' ),
-				'requires_php' => $theme->get( 'RequiresPHP' ),
+				'requires'     => $theme->get('RequiresWP'),
+				'requires_php' => $theme->get('RequiresPHP'),
 			);
 		}
 
-		$auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $auto_update_filter_payload );
+		$auto_update_forced = wp_is_auto_update_forced_for_item('theme', null, $auto_update_filter_payload);
 
-		$prepared_themes[ $slug ] = array(
+		$prepared_themes[$slug] = array(
 			'id'             => $slug,
-			'name'           => $theme->display( 'Name' ),
-			'screenshot'     => array( $theme->get_screenshot() ), // @todo Multiple screenshots.
-			'description'    => $theme->display( 'Description' ),
-			'author'         => $theme->display( 'Author', false, true ),
-			'authorAndUri'   => $theme->display( 'Author' ),
-			'tags'           => $theme->display( 'Tags' ),
-			'version'        => $theme->get( 'Version' ),
-			'compatibleWP'   => is_wp_version_compatible( $theme->get( 'RequiresWP' ) ),
-			'compatiblePHP'  => is_php_version_compatible( $theme->get( 'RequiresPHP' ) ),
+			'name'           => $theme->display('Name'),
+			'screenshot'     => array($theme->get_screenshot()), // @todo Multiple screenshots.
+			'description'    => $theme->display('Description'),
+			'author'         => $theme->display('Author', false, true),
+			'authorAndUri'   => $theme->display('Author'),
+			'tags'           => $theme->display('Tags'),
+			'version'        => $theme->get('Version'),
+			'compatibleWP'   => is_wp_version_compatible($theme->get('RequiresWP')),
+			'compatiblePHP'  => is_php_version_compatible($theme->get('RequiresPHP')),
 			'updateResponse' => array(
-				'compatibleWP'  => is_wp_version_compatible( $update_requires_wp ),
-				'compatiblePHP' => is_php_version_compatible( $update_requires_php ),
+				'compatibleWP'  => is_wp_version_compatible($update_requires_wp),
+				'compatiblePHP' => is_php_version_compatible($update_requires_php),
 			),
 			'parent'         => $parent,
 			'active'         => $slug === $current_theme,
-			'hasUpdate'      => isset( $updates[ $slug ] ),
-			'hasPackage'     => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
-			'update'         => get_theme_update_available( $theme ),
+			'hasUpdate'      => isset($updates[$slug]),
+			'hasPackage'     => isset($updates[$slug]) && !empty($updates[$slug]['package']),
+			'update'         => get_theme_update_available($theme),
 			'autoupdate'     => array(
 				'enabled'   => $auto_update || $auto_update_forced,
 				'supported' => $auto_update_supported,
 				'forced'    => $auto_update_forced,
 			),
 			'actions'        => array(
-				'activate'   => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+				'activate'   => current_user_can('switch_themes') ? wp_nonce_url(admin_url('themes.php?action=activate&amp;stylesheet=' . $encoded_slug), 'switch-theme_' . $slug) : null,
 				'customize'  => $customize_action,
-				'delete'     => ( ! is_multisite() && current_user_can( 'delete_themes' ) ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
-				'autoupdate' => wp_is_auto_update_enabled_for_type( 'theme' ) && ! is_multisite() && current_user_can( 'update_themes' )
-					? wp_nonce_url( admin_url( 'themes.php?action=' . $auto_update_action . '&amp;stylesheet=' . $encoded_slug ), 'updates' )
+				'delete'     => (!is_multisite() && current_user_can('delete_themes')) ? wp_nonce_url(admin_url('themes.php?action=delete&amp;stylesheet=' . $encoded_slug), 'delete-theme_' . $slug) : null,
+				'autoupdate' => wp_is_auto_update_enabled_for_type('theme') && !is_multisite() && current_user_can('update_themes')
+					? wp_nonce_url(admin_url('themes.php?action=' . $auto_update_action . '&amp;stylesheet=' . $encoded_slug), 'updates')
 					: null,
 			),
 			'blockTheme'     => $theme->is_block_theme(),
@@ -787,8 +787,8 @@ 
 	}
 
 	// Remove 'delete' action if theme has an active child.
-	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
-		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+	if (!empty($parents) && array_key_exists($current_theme, $parents)) {
+		unset($prepared_themes[$parents[$current_theme]]['actions']['delete']);
 	}
 
 	/**
@@ -800,9 +800,9 @@ 
 	 *
 	 * @param array $prepared_themes Array of theme data.
 	 */
-	$prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
-	$prepared_themes = array_values( $prepared_themes );
-	return array_filter( $prepared_themes );
+	$prepared_themes = apply_filters('wp_prepare_themes_for_js', $prepared_themes);
+	$prepared_themes = array_values($prepared_themes);
+	return array_filter($prepared_themes);
 }
 
 /**
@@ -816,9 +816,9 @@ 
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap wp-clearfix" role="document">
 			<div class="theme-header">
-				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show previous theme'); ?></span></button>
+				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show next theme'); ?></span></button>
+				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close details dialog'); ?></span></button>
 			</div>
 			<div class="theme-about wp-clearfix">
 				<div class="theme-screenshots">
@@ -831,18 +831,18 @@ 
 
 				<div class="theme-info">
 					<# if ( data.active ) { #>
-						<span class="current-label"><?php _e( 'Active Theme' ); ?></span>
+						<span class="current-label"><?php _e('Active Theme'); ?></span>
 					<# } #>
 					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version">
 						<?php
 						/* translators: %s: Theme version. */
-						printf( __( 'Version: %s' ), '{{ data.version }}' );
+						printf(__('Version: %s'), '{{ data.version }}');
 						?>
 					</span></h2>
 					<h3 class="theme-author">
 						<?php
 						/* translators: %s: Theme author link. */
-						printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' );
+						printf(__('By %s'), '{{{ data.authorAndUri }}}');
 						?>
 					</h3>
 
@@ -854,9 +854,9 @@ 
 								printf(
 									'%1$s <span class="screen-reader-text">%2$s</span>',
 									/* translators: %s: Number of ratings. */
-									sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' ),
+									sprintf(__('(%s ratings)'), '{{ data.num_ratings }}'),
 									/* translators: Accessibility text. */
-									__( '(opens in a new tab)' )
+									__('(opens in a new tab)')
 								);
 								?>
 							</a>
@@ -866,55 +866,55 @@ 
 					<# if ( data.hasUpdate ) { #>
 						<# if ( data.updateResponse.compatibleWP && data.updateResponse.compatiblePHP ) { #>
 							<div class="notice notice-warning notice-alt notice-large" data-slug="{{ data.id }}">
-								<h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>
+								<h3 class="notice-title"><?php _e('Update Available'); ?></h3>
 								{{{ data.update }}}
 							</div>
 						<# } else { #>
 							<div class="notice notice-error notice-alt notice-large" data-slug="{{ data.id }}">
-								<h3 class="notice-title"><?php _e( 'Update Incompatible' ); ?></h3>
+								<h3 class="notice-title"><?php _e('Update Incompatible'); ?></h3>
 								<p>
 									<# if ( ! data.updateResponse.compatibleWP && ! data.updateResponse.compatiblePHP ) { #>
 										<?php
 										printf(
 											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ),
+											__('There is a new version of %s available, but it does not work with your versions of WordPress and PHP.'),
 											'{{{ data.name }}}'
 										);
-										if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+										if (current_user_can('update_core') && current_user_can('update_php')) {
 											printf(
 												/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-												' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-												self_admin_url( 'update-core.php' ),
-												esc_url( wp_get_update_php_url() )
+												' ' . __('<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.'),
+												self_admin_url('update-core.php'),
+												esc_url(wp_get_update_php_url())
 											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
-										} elseif ( current_user_can( 'update_core' ) ) {
+											wp_update_php_annotation('</p><p><em>', '</em>');
+										} elseif (current_user_can('update_core')) {
 											printf(
 												/* translators: %s: URL to WordPress Updates screen. */
-												' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-												self_admin_url( 'update-core.php' )
+												' ' . __('<a href="%s">Please update WordPress</a>.'),
+												self_admin_url('update-core.php')
 											);
-										} elseif ( current_user_can( 'update_php' ) ) {
+										} elseif (current_user_can('update_php')) {
 											printf(
 												/* translators: %s: URL to Update PHP page. */
-												' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-												esc_url( wp_get_update_php_url() )
+												' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+												esc_url(wp_get_update_php_url())
 											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
+											wp_update_php_annotation('</p><p><em>', '</em>');
 										}
 										?>
 									<# } else if ( ! data.updateResponse.compatibleWP ) { #>
 										<?php
 										printf(
 											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your version of WordPress.' ),
+											__('There is a new version of %s available, but it does not work with your version of WordPress.'),
 											'{{{ data.name }}}'
 										);
-										if ( current_user_can( 'update_core' ) ) {
+										if (current_user_can('update_core')) {
 											printf(
 												/* translators: %s: URL to WordPress Updates screen. */
-												' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-												self_admin_url( 'update-core.php' )
+												' ' . __('<a href="%s">Please update WordPress</a>.'),
+												self_admin_url('update-core.php')
 											);
 										}
 										?>
@@ -922,16 +922,16 @@ 
 										<?php
 										printf(
 											/* translators: %s: Theme name. */
-											__( 'There is a new version of %s available, but it does not work with your version of PHP.' ),
+											__('There is a new version of %s available, but it does not work with your version of PHP.'),
 											'{{{ data.name }}}'
 										);
-										if ( current_user_can( 'update_php' ) ) {
+										if (current_user_can('update_php')) {
 											printf(
 												/* translators: %s: URL to Update PHP page. */
-												' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-												esc_url( wp_get_update_php_url() )
+												' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+												esc_url(wp_get_update_php_url())
 											);
-											wp_update_php_annotation( '</p><p><em>', '</em>' );
+											wp_update_php_annotation('</p><p><em>', '</em>');
 										}
 										?>
 									<# } #>
@@ -945,7 +945,7 @@ 
 							<?php
 							printf(
 								/* translators: %s: Theme name. */
-								__( 'This is a child theme of %s.' ),
+								__('This is a child theme of %s.'),
 								'<strong>{{{ data.parent }}}</strong>'
 							);
 							?>
@@ -956,51 +956,51 @@ 
 						<div class="notice notice-error notice-alt notice-large"><p>
 							<# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #>
 								<?php
-								_e( 'This theme does not work with your versions of WordPress and PHP.' );
-								if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
+								_e('This theme does not work with your versions of WordPress and PHP.');
+								if (current_user_can('update_core') && current_user_can('update_php')) {
 									printf(
 										/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
-										' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
-										self_admin_url( 'update-core.php' ),
-										esc_url( wp_get_update_php_url() )
+										' ' . __('<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.'),
+										self_admin_url('update-core.php'),
+										esc_url(wp_get_update_php_url())
 									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
-								} elseif ( current_user_can( 'update_core' ) ) {
+									wp_update_php_annotation('</p><p><em>', '</em>');
+								} elseif (current_user_can('update_core')) {
 									printf(
 										/* translators: %s: URL to WordPress Updates screen. */
-										' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-										self_admin_url( 'update-core.php' )
+										' ' . __('<a href="%s">Please update WordPress</a>.'),
+										self_admin_url('update-core.php')
 									);
-								} elseif ( current_user_can( 'update_php' ) ) {
+								} elseif (current_user_can('update_php')) {
 									printf(
 										/* translators: %s: URL to Update PHP page. */
-										' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-										esc_url( wp_get_update_php_url() )
+										' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+										esc_url(wp_get_update_php_url())
 									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
+									wp_update_php_annotation('</p><p><em>', '</em>');
 								}
 								?>
 							<# } else if ( ! data.compatibleWP ) { #>
 								<?php
-								_e( 'This theme does not work with your version of WordPress.' );
-								if ( current_user_can( 'update_core' ) ) {
+								_e('This theme does not work with your version of WordPress.');
+								if (current_user_can('update_core')) {
 									printf(
 										/* translators: %s: URL to WordPress Updates screen. */
-										' ' . __( '<a href="%s">Please update WordPress</a>.' ),
-										self_admin_url( 'update-core.php' )
+										' ' . __('<a href="%s">Please update WordPress</a>.'),
+										self_admin_url('update-core.php')
 									);
 								}
 								?>
 							<# } else if ( ! data.compatiblePHP ) { #>
 								<?php
-								_e( 'This theme does not work with your version of PHP.' );
-								if ( current_user_can( 'update_php' ) ) {
+								_e('This theme does not work with your version of PHP.');
+								if (current_user_can('update_php')) {
 									printf(
 										/* translators: %s: URL to Update PHP page. */
-										' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
-										esc_url( wp_get_update_php_url() )
+										' ' . __('<a href="%s">Learn more about updating PHP</a>.'),
+										esc_url(wp_get_update_php_url())
 									);
-									wp_update_php_annotation( '</p><p><em>', '</em>' );
+									wp_update_php_annotation('</p><p><em>', '</em>');
 								}
 								?>
 							<# } #>
@@ -1008,13 +1008,13 @@ 
 					<# } else if ( ! data.active && data.blockTheme ) { #>
 						<div class="notice notice-error notice-alt notice-large"><p>
 						<?php
-							_e( 'This theme doesn\'t support Customizer.' );
+							_e('This theme doesn\'t support Customizer.');
 						?>
 						<# if ( data.actions.activate ) { #>
 							<?php
 							printf(
 								/* translators: %s: URL to the themes page (also it activates the theme). */
-								' ' . __( 'However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.' ),
+								' ' . __('However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.'),
 								'{{{ data.actions.activate }}}'
 							);
 							?>
@@ -1025,43 +1025,43 @@ 
 					<p class="theme-description">{{{ data.description }}}</p>
 
 					<# if ( data.tags ) { #>
-						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
+						<p class="theme-tags"><span><?php _e('Tags:'); ?></span> {{{ data.tags }}}</p>
 					<# } #>
 				</div>
 			</div>
 
 			<div class="theme-actions">
 				<# if ( data.active ) { #>
-					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
+					<button type="button" class="button button-primary customize-theme"><?php _e('Customize'); ?></button>
 				<# } else if ( 'installed' === data.type ) { #>
-					<?php if ( current_user_can( 'delete_themes' ) ) { ?>
+					<?php if (current_user_can('delete_themes')) { ?>
 						<# if ( data.actions && data.actions['delete'] ) { #>
-							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e('Delete'); ?></a>
 						<# } #>
 					<?php } ?>
 
 					<# if ( data.blockTheme ) { #>
 						<?php
 							/* translators: %s: Theme name. */
-							$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+							$aria_label = sprintf(_x('Activate %s', 'theme'), '{{ data.name }}');
 						?>
 						<# if ( data.compatibleWP && data.compatiblePHP && data.actions.activate ) { #>
-							<a href="{{{ data.actions.activate }}}" class="button button-primary activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+							<a href="{{{ data.actions.activate }}}" class="button button-primary activate" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Activate'); ?></a>
 						<# } #>
 					<# } else { #>
 						<# if ( data.compatibleWP && data.compatiblePHP ) { #>
-							<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
+							<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e('Live Preview'); ?></button>
 						<# } else { #>
-							<button class="button button-primary disabled"><?php _e( 'Live Preview' ); ?></button>
+							<button class="button button-primary disabled"><?php _e('Live Preview'); ?></button>
 						<# } #>
 					<# } #>
 				<# } else { #>
 					<# if ( data.compatibleWP && data.compatiblePHP ) { #>
-						<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
-						<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>
+						<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e('Install'); ?></button>
+						<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e('Install &amp; Preview'); ?></button>
 					<# } else { #>
-						<button type="button" class="button disabled"><?php _ex( 'Cannot Install', 'theme' ); ?></button>
-						<button type="button" class="button button-primary disabled"><?php _e( 'Install &amp; Preview' ); ?></button>
+						<button type="button" class="button disabled"><?php _ex('Cannot Install', 'theme'); ?></button>
+						<button type="button" class="button button-primary disabled"><?php _e('Install &amp; Preview'); ?></button>
 					<# } #>
 				<# } #>
 			</div>
@@ -1083,16 +1083,16 @@ 
  * @param string $theme Path to the theme directory relative to the themes directory.
  * @return bool True, if in the list of paused themes. False, not in the list.
  */
-function is_theme_paused( $theme ) {
-	if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
+function is_theme_paused($theme) {
+	if (!isset($GLOBALS['_paused_themes'])) {
 		return false;
 	}
 
-	if ( get_stylesheet() !== $theme && get_template() !== $theme ) {
+	if (get_stylesheet() !== $theme && get_template() !== $theme) {
 		return false;
 	}
 
-	return array_key_exists( $theme, $GLOBALS['_paused_themes'] );
+	return array_key_exists($theme, $GLOBALS['_paused_themes']);
 }
 
 /**
@@ -1105,16 +1105,16 @@ 
  * @return array|false Array of error information as it was returned by
  *                     `error_get_last()`, or false if none was recorded.
  */
-function wp_get_theme_error( $theme ) {
-	if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
+function wp_get_theme_error($theme) {
+	if (!isset($GLOBALS['_paused_themes'])) {
 		return false;
 	}
 
-	if ( ! array_key_exists( $theme, $GLOBALS['_paused_themes'] ) ) {
+	if (!array_key_exists($theme, $GLOBALS['_paused_themes'])) {
 		return false;
 	}
 
-	return $GLOBALS['_paused_themes'][ $theme ];
+	return $GLOBALS['_paused_themes'][$theme];
 }
 
 /**
@@ -1134,46 +1134,46 @@ 
  * @return bool|WP_Error True on success, false if `$theme` was not paused,
  *                       `WP_Error` on failure.
  */
-function resume_theme( $theme, $redirect = '' ) {
-	list( $extension ) = explode( '/', $theme );
+function resume_theme($theme, $redirect = '') {
+	list($extension) = explode('/', $theme);
 
 	/*
 	 * We'll override this later if the theme could be resumed without
 	 * creating a fatal error.
 	 */
-	if ( ! empty( $redirect ) ) {
+	if (!empty($redirect)) {
 		$functions_path = '';
-		if ( strpos( STYLESHEETPATH, $extension ) ) {
+		if (strpos(STYLESHEETPATH, $extension)) {
 			$functions_path = STYLESHEETPATH . '/functions.php';
-		} elseif ( strpos( TEMPLATEPATH, $extension ) ) {
+		} elseif (strpos(TEMPLATEPATH, $extension)) {
 			$functions_path = TEMPLATEPATH . '/functions.php';
 		}
 
-		if ( ! empty( $functions_path ) ) {
+		if (!empty($functions_path)) {
 			wp_redirect(
 				add_query_arg(
 					'_error_nonce',
-					wp_create_nonce( 'theme-resume-error_' . $theme ),
+					wp_create_nonce('theme-resume-error_' . $theme),
 					$redirect
 				)
 			);
 
 			// Load the theme's functions.php to test whether it throws a fatal error.
 			ob_start();
-			if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
-				define( 'WP_SANDBOX_SCRAPING', true );
+			if (!defined('WP_SANDBOX_SCRAPING')) {
+				define('WP_SANDBOX_SCRAPING', true);
 			}
 			include $functions_path;
 			ob_clean();
 		}
 	}
 
-	$result = wp_paused_themes()->delete( $extension );
+	$result = wp_paused_themes()->delete($extension);
 
-	if ( ! $result ) {
+	if (!$result) {
 		return new WP_Error(
 			'could_not_resume_theme',
-			__( 'Could not resume the theme.' )
+			__('Could not resume the theme.')
 		);
 	}
 
@@ -1188,23 +1188,23 @@ 
  * @global string $pagenow The filename of the current screen.
  */
 function paused_themes_notice() {
-	if ( 'themes.php' === $GLOBALS['pagenow'] ) {
+	if ('themes.php' === $GLOBALS['pagenow']) {
 		return;
 	}
 
-	if ( ! current_user_can( 'resume_themes' ) ) {
+	if (!current_user_can('resume_themes')) {
 		return;
 	}
 
-	if ( ! isset( $GLOBALS['_paused_themes'] ) || empty( $GLOBALS['_paused_themes'] ) ) {
+	if (!isset($GLOBALS['_paused_themes']) || empty($GLOBALS['_paused_themes'])) {
 		return;
 	}
 
 	printf(
 		'<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
-		__( 'One or more themes failed to load properly.' ),
-		__( 'You can find more details and make changes on the Themes screen.' ),
-		esc_url( admin_url( 'themes.php' ) ),
-		__( 'Go to the Themes screen' )
+		__('One or more themes failed to load properly.'),
+		__('You can find more details and make changes on the Themes screen.'),
+		esc_url(admin_url('themes.php')),
+		__('Go to the Themes screen')
 	);
 }

brighty/wp-admin/includes/class-file-upload-upgrader.php

Indentation +112 added lines, -112 removed lines

@@ -18,116 +18,116 @@
  */
 class File_Upload_Upgrader {
 
-	/**
-	 * The full path to the file package.
-	 *
-	 * @since 2.8.0
-	 * @var string $package
-	 */
-	public $package;
-
-	/**
-	 * The name of the file.
-	 *
-	 * @since 2.8.0
-	 * @var string $filename
-	 */
-	public $filename;
-
-	/**
-	 * The ID of the attachment post for this file.
-	 *
-	 * @since 3.3.0
-	 * @var int $id
-	 */
-	public $id = 0;
-
-	/**
-	 * Construct the upgrader for a form.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param string $form      The name of the form the file was uploaded from.
-	 * @param string $urlholder The name of the `GET` parameter that holds the filename.
-	 */
-	public function __construct( $form, $urlholder ) {
-
-		if ( empty( $_FILES[ $form ]['name'] ) && empty( $_GET[ $urlholder ] ) ) {
-			wp_die( __( 'Please select a file' ) );
-		}
-
-		// Handle a newly uploaded file. Else, assume it's already been uploaded.
-		if ( ! empty( $_FILES ) ) {
-			$overrides = array(
-				'test_form' => false,
-				'test_type' => false,
-			);
-			$file      = wp_handle_upload( $_FILES[ $form ], $overrides );
-
-			if ( isset( $file['error'] ) ) {
-				wp_die( $file['error'] );
-			}
-
-			$this->filename = $_FILES[ $form ]['name'];
-			$this->package  = $file['file'];
-
-			// Construct the attachment array.
-			$attachment = array(
-				'post_title'     => $this->filename,
-				'post_content'   => $file['url'],
-				'post_mime_type' => $file['type'],
-				'guid'           => $file['url'],
-				'context'        => 'upgrader',
-				'post_status'    => 'private',
-			);
-
-			// Save the data.
-			$this->id = wp_insert_attachment( $attachment, $file['file'] );
-
-			// Schedule a cleanup for 2 hours from now in case of failed installation.
-			wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
-
-		} elseif ( is_numeric( $_GET[ $urlholder ] ) ) {
-			// Numeric Package = previously uploaded file, see above.
-			$this->id   = (int) $_GET[ $urlholder ];
-			$attachment = get_post( $this->id );
-			if ( empty( $attachment ) ) {
-				wp_die( __( 'Please select a file' ) );
-			}
-
-			$this->filename = $attachment->post_title;
-			$this->package  = get_attached_file( $attachment->ID );
-		} else {
-			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
-			$uploads = wp_upload_dir();
-			if ( ! ( $uploads && false === $uploads['error'] ) ) {
-				wp_die( $uploads['error'] );
-			}
-
-			$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
-			$this->package  = $uploads['basedir'] . '/' . $this->filename;
-
-			if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
-				wp_die( __( 'Please select a file' ) );
-			}
-		}
-	}
-
-	/**
-	 * Delete the attachment/uploaded file.
-	 *
-	 * @since 3.2.2
-	 *
-	 * @return bool Whether the cleanup was successful.
-	 */
-	public function cleanup() {
-		if ( $this->id ) {
-			wp_delete_attachment( $this->id );
-
-		} elseif ( file_exists( $this->package ) ) {
-			return @unlink( $this->package );
-		}
-
-		return true;
-	}
+    /**
+     * The full path to the file package.
+     *
+     * @since 2.8.0
+     * @var string $package
+     */
+    public $package;
+
+    /**
+     * The name of the file.
+     *
+     * @since 2.8.0
+     * @var string $filename
+     */
+    public $filename;
+
+    /**
+     * The ID of the attachment post for this file.
+     *
+     * @since 3.3.0
+     * @var int $id
+     */
+    public $id = 0;
+
+    /**
+     * Construct the upgrader for a form.
+     *
+     * @since 2.8.0
+     *
+     * @param string $form      The name of the form the file was uploaded from.
+     * @param string $urlholder The name of the `GET` parameter that holds the filename.
+     */
+    public function __construct( $form, $urlholder ) {
+
+        if ( empty( $_FILES[ $form ]['name'] ) && empty( $_GET[ $urlholder ] ) ) {
+            wp_die( __( 'Please select a file' ) );
+        }
+
+        // Handle a newly uploaded file. Else, assume it's already been uploaded.
+        if ( ! empty( $_FILES ) ) {
+            $overrides = array(
+                'test_form' => false,
+                'test_type' => false,
+            );
+            $file      = wp_handle_upload( $_FILES[ $form ], $overrides );
+
+            if ( isset( $file['error'] ) ) {
+                wp_die( $file['error'] );
+            }
+
+            $this->filename = $_FILES[ $form ]['name'];
+            $this->package  = $file['file'];
+
+            // Construct the attachment array.
+            $attachment = array(
+                'post_title'     => $this->filename,
+                'post_content'   => $file['url'],
+                'post_mime_type' => $file['type'],
+                'guid'           => $file['url'],
+                'context'        => 'upgrader',
+                'post_status'    => 'private',
+            );
+
+            // Save the data.
+            $this->id = wp_insert_attachment( $attachment, $file['file'] );
+
+            // Schedule a cleanup for 2 hours from now in case of failed installation.
+            wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
+
+        } elseif ( is_numeric( $_GET[ $urlholder ] ) ) {
+            // Numeric Package = previously uploaded file, see above.
+            $this->id   = (int) $_GET[ $urlholder ];
+            $attachment = get_post( $this->id );
+            if ( empty( $attachment ) ) {
+                wp_die( __( 'Please select a file' ) );
+            }
+
+            $this->filename = $attachment->post_title;
+            $this->package  = get_attached_file( $attachment->ID );
+        } else {
+            // Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
+            $uploads = wp_upload_dir();
+            if ( ! ( $uploads && false === $uploads['error'] ) ) {
+                wp_die( $uploads['error'] );
+            }
+
+            $this->filename = sanitize_file_name( $_GET[ $urlholder ] );
+            $this->package  = $uploads['basedir'] . '/' . $this->filename;
+
+            if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
+                wp_die( __( 'Please select a file' ) );
+            }
+        }
+    }
+
+    /**
+     * Delete the attachment/uploaded file.
+     *
+     * @since 3.2.2
+     *
+     * @return bool Whether the cleanup was successful.
+     */
+    public function cleanup() {
+        if ( $this->id ) {
+            wp_delete_attachment( $this->id );
+
+        } elseif ( file_exists( $this->package ) ) {
+            return @unlink( $this->package );
+        }
+
+        return true;
+    }
 }

Spacing +25 added lines, -25 removed lines

@@ -50,25 +50,25 @@ 
 	 * @param string $form      The name of the form the file was uploaded from.
 	 * @param string $urlholder The name of the `GET` parameter that holds the filename.
 	 */
-	public function __construct( $form, $urlholder ) {
+	public function __construct($form, $urlholder) {
 
-		if ( empty( $_FILES[ $form ]['name'] ) && empty( $_GET[ $urlholder ] ) ) {
-			wp_die( __( 'Please select a file' ) );
+		if (empty($_FILES[$form]['name']) && empty($_GET[$urlholder])) {
+			wp_die(__('Please select a file'));
 		}
 
 		// Handle a newly uploaded file. Else, assume it's already been uploaded.
-		if ( ! empty( $_FILES ) ) {
+		if (!empty($_FILES)) {
 			$overrides = array(
 				'test_form' => false,
 				'test_type' => false,
 			);
-			$file      = wp_handle_upload( $_FILES[ $form ], $overrides );
+			$file = wp_handle_upload($_FILES[$form], $overrides);
 
-			if ( isset( $file['error'] ) ) {
-				wp_die( $file['error'] );
+			if (isset($file['error'])) {
+				wp_die($file['error']);
 			}
 
-			$this->filename = $_FILES[ $form ]['name'];
+			$this->filename = $_FILES[$form]['name'];
 			$this->package  = $file['file'];
 
 			// Construct the attachment array.
@@ -82,33 +82,33 @@ 
 			);
 
 			// Save the data.
-			$this->id = wp_insert_attachment( $attachment, $file['file'] );
+			$this->id = wp_insert_attachment($attachment, $file['file']);
 
 			// Schedule a cleanup for 2 hours from now in case of failed installation.
-			wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
+			wp_schedule_single_event(time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array($this->id));
 
-		} elseif ( is_numeric( $_GET[ $urlholder ] ) ) {
+		} elseif (is_numeric($_GET[$urlholder])) {
 			// Numeric Package = previously uploaded file, see above.
-			$this->id   = (int) $_GET[ $urlholder ];
-			$attachment = get_post( $this->id );
-			if ( empty( $attachment ) ) {
-				wp_die( __( 'Please select a file' ) );
+			$this->id   = (int) $_GET[$urlholder];
+			$attachment = get_post($this->id);
+			if (empty($attachment)) {
+				wp_die(__('Please select a file'));
 			}
 
 			$this->filename = $attachment->post_title;
-			$this->package  = get_attached_file( $attachment->ID );
+			$this->package  = get_attached_file($attachment->ID);
 		} else {
 			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
 			$uploads = wp_upload_dir();
-			if ( ! ( $uploads && false === $uploads['error'] ) ) {
-				wp_die( $uploads['error'] );
+			if (!($uploads && false === $uploads['error'])) {
+				wp_die($uploads['error']);
 			}
 
-			$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
+			$this->filename = sanitize_file_name($_GET[$urlholder]);
 			$this->package  = $uploads['basedir'] . '/' . $this->filename;
 
-			if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
-				wp_die( __( 'Please select a file' ) );
+			if (0 !== strpos(realpath($this->package), realpath($uploads['basedir']))) {
+				wp_die(__('Please select a file'));
 			}
 		}
 	}
@@ -121,11 +121,11 @@ 
 	 * @return bool Whether the cleanup was successful.
 	 */
 	public function cleanup() {
-		if ( $this->id ) {
-			wp_delete_attachment( $this->id );
+		if ($this->id) {
+			wp_delete_attachment($this->id);
 
-		} elseif ( file_exists( $this->package ) ) {
-			return @unlink( $this->package );
+		} elseif (file_exists($this->package)) {
+			return @unlink($this->package);
 		}
 
 		return true;

brighty/wp-admin/includes/privacy-tools.php

Indentation +775 added lines, -775 removed lines

@@ -16,22 +16,22 @@ 
  * @return true|WP_Error Returns true if sending the email was successful, or a WP_Error object.
  */
 function _wp_privacy_resend_request( $request_id ) {
-	$request_id = absint( $request_id );
-	$request    = get_post( $request_id );
+    $request_id = absint( $request_id );
+    $request    = get_post( $request_id );
 
-	if ( ! $request || 'user_request' !== $request->post_type ) {
-		return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
-	}
+    if ( ! $request || 'user_request' !== $request->post_type ) {
+        return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
+    }
 
-	$result = wp_send_user_request( $request_id );
+    $result = wp_send_user_request( $request_id );
 
-	if ( is_wp_error( $result ) ) {
-		return $result;
-	} elseif ( ! $result ) {
-		return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation for personal data request.' ) );
-	}
+    if ( is_wp_error( $result ) ) {
+        return $result;
+    } elseif ( ! $result ) {
+        return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation for personal data request.' ) );
+    }
 
-	return true;
+    return true;
 }
 
 /**
@@ -44,24 +44,24 @@ 
  * @return int|WP_Error Request ID on success, or a WP_Error on failure.
  */
 function _wp_privacy_completed_request( $request_id ) {
-	// Get the request.
-	$request_id = absint( $request_id );
-	$request    = wp_get_user_request( $request_id );
+    // Get the request.
+    $request_id = absint( $request_id );
+    $request    = wp_get_user_request( $request_id );
 
-	if ( ! $request ) {
-		return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
-	}
+    if ( ! $request ) {
+        return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
+    }
 
-	update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
+    update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
 
-	$result = wp_update_post(
-		array(
-			'ID'          => $request_id,
-			'post_status' => 'request-completed',
-		)
-	);
+    $result = wp_update_post(
+        array(
+            'ID'          => $request_id,
+            'post_status' => 'request-completed',
+        )
+    );
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -71,119 +71,119 @@ 
  * @access private
  */
 function _wp_personal_data_handle_actions() {
-	if ( isset( $_POST['privacy_action_email_retry'] ) ) {
-		check_admin_referer( 'bulk-privacy_requests' );
-
-		$request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) );
-		$result     = _wp_privacy_resend_request( $request_id );
-
-		if ( is_wp_error( $result ) ) {
-			add_settings_error(
-				'privacy_action_email_retry',
-				'privacy_action_email_retry',
-				$result->get_error_message(),
-				'error'
-			);
-		} else {
-			add_settings_error(
-				'privacy_action_email_retry',
-				'privacy_action_email_retry',
-				__( 'Confirmation request sent again successfully.' ),
-				'success'
-			);
-		}
-	} elseif ( isset( $_POST['action'] ) ) {
-		$action = ! empty( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : '';
-
-		switch ( $action ) {
-			case 'add_export_personal_data_request':
-			case 'add_remove_personal_data_request':
-				check_admin_referer( 'personal-data-request' );
-
-				if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
-					add_settings_error(
-						'action_type',
-						'action_type',
-						__( 'Invalid personal data action.' ),
-						'error'
-					);
-				}
-				$action_type               = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
-				$username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
-				$email_address             = '';
-				$status                    = 'pending';
-
-				if ( ! isset( $_POST['send_confirmation_email'] ) ) {
-					$status = 'confirmed';
-				}
-
-				if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
-					add_settings_error(
-						'action_type',
-						'action_type',
-						__( 'Invalid personal data action.' ),
-						'error'
-					);
-				}
-
-				if ( ! is_email( $username_or_email_address ) ) {
-					$user = get_user_by( 'login', $username_or_email_address );
-					if ( ! $user instanceof WP_User ) {
-						add_settings_error(
-							'username_or_email_for_privacy_request',
-							'username_or_email_for_privacy_request',
-							__( 'Unable to add this request. A valid email address or username must be supplied.' ),
-							'error'
-						);
-					} else {
-						$email_address = $user->user_email;
-					}
-				} else {
-					$email_address = $username_or_email_address;
-				}
-
-				if ( empty( $email_address ) ) {
-					break;
-				}
-
-				$request_id = wp_create_user_request( $email_address, $action_type, array(), $status );
-				$message    = '';
-
-				if ( is_wp_error( $request_id ) ) {
-					$message = $request_id->get_error_message();
-				} elseif ( ! $request_id ) {
-					$message = __( 'Unable to initiate confirmation request.' );
-				}
-
-				if ( $message ) {
-					add_settings_error(
-						'username_or_email_for_privacy_request',
-						'username_or_email_for_privacy_request',
-						$message,
-						'error'
-					);
-					break;
-				}
-
-				if ( 'pending' === $status ) {
-					wp_send_user_request( $request_id );
-
-					$message = __( 'Confirmation request initiated successfully.' );
-				} elseif ( 'confirmed' === $status ) {
-					$message = __( 'Request added successfully.' );
-				}
-
-				if ( $message ) {
-					add_settings_error(
-						'username_or_email_for_privacy_request',
-						'username_or_email_for_privacy_request',
-						$message,
-						'success'
-					);
-					break;
-				}
-		}
-	}
+    if ( isset( $_POST['privacy_action_email_retry'] ) ) {
+        check_admin_referer( 'bulk-privacy_requests' );
+
+        $request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) );
+        $result     = _wp_privacy_resend_request( $request_id );
+
+        if ( is_wp_error( $result ) ) {
+            add_settings_error(
+                'privacy_action_email_retry',
+                'privacy_action_email_retry',
+                $result->get_error_message(),
+                'error'
+            );
+        } else {
+            add_settings_error(
+                'privacy_action_email_retry',
+                'privacy_action_email_retry',
+                __( 'Confirmation request sent again successfully.' ),
+                'success'
+            );
+        }
+    } elseif ( isset( $_POST['action'] ) ) {
+        $action = ! empty( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : '';
+
+        switch ( $action ) {
+            case 'add_export_personal_data_request':
+            case 'add_remove_personal_data_request':
+                check_admin_referer( 'personal-data-request' );
+
+                if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
+                    add_settings_error(
+                        'action_type',
+                        'action_type',
+                        __( 'Invalid personal data action.' ),
+                        'error'
+                    );
+                }
+                $action_type               = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
+                $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
+                $email_address             = '';
+                $status                    = 'pending';
+
+                if ( ! isset( $_POST['send_confirmation_email'] ) ) {
+                    $status = 'confirmed';
+                }
+
+                if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
+                    add_settings_error(
+                        'action_type',
+                        'action_type',
+                        __( 'Invalid personal data action.' ),
+                        'error'
+                    );
+                }
+
+                if ( ! is_email( $username_or_email_address ) ) {
+                    $user = get_user_by( 'login', $username_or_email_address );
+                    if ( ! $user instanceof WP_User ) {
+                        add_settings_error(
+                            'username_or_email_for_privacy_request',
+                            'username_or_email_for_privacy_request',
+                            __( 'Unable to add this request. A valid email address or username must be supplied.' ),
+                            'error'
+                        );
+                    } else {
+                        $email_address = $user->user_email;
+                    }
+                } else {
+                    $email_address = $username_or_email_address;
+                }
+
+                if ( empty( $email_address ) ) {
+                    break;
+                }
+
+                $request_id = wp_create_user_request( $email_address, $action_type, array(), $status );
+                $message    = '';
+
+                if ( is_wp_error( $request_id ) ) {
+                    $message = $request_id->get_error_message();
+                } elseif ( ! $request_id ) {
+                    $message = __( 'Unable to initiate confirmation request.' );
+                }
+
+                if ( $message ) {
+                    add_settings_error(
+                        'username_or_email_for_privacy_request',
+                        'username_or_email_for_privacy_request',
+                        $message,
+                        'error'
+                    );
+                    break;
+                }
+
+                if ( 'pending' === $status ) {
+                    wp_send_user_request( $request_id );
+
+                    $message = __( 'Confirmation request initiated successfully.' );
+                } elseif ( 'confirmed' === $status ) {
+                    $message = __( 'Request added successfully.' );
+                }
+
+                if ( $message ) {
+                    add_settings_error(
+                        'username_or_email_for_privacy_request',
+                        'username_or_email_for_privacy_request',
+                        $message,
+                        'success'
+                    );
+                    break;
+                }
+        }
+    }
 }
 
 /**
@@ -193,35 +193,35 @@ 
  * @access private
  */
 function _wp_personal_data_cleanup_requests() {
-	/** This filter is documented in wp-includes/user.php */
-	$expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
-
-	$requests_query = new WP_Query(
-		array(
-			'post_type'      => 'user_request',
-			'posts_per_page' => -1,
-			'post_status'    => 'request-pending',
-			'fields'         => 'ids',
-			'date_query'     => array(
-				array(
-					'column' => 'post_modified_gmt',
-					'before' => $expires . ' seconds ago',
-				),
-			),
-		)
-	);
-
-	$request_ids = $requests_query->posts;
-
-	foreach ( $request_ids as $request_id ) {
-		wp_update_post(
-			array(
-				'ID'            => $request_id,
-				'post_status'   => 'request-failed',
-				'post_password' => '',
-			)
-		);
-	}
+    /** This filter is documented in wp-includes/user.php */
+    $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
+
+    $requests_query = new WP_Query(
+        array(
+            'post_type'      => 'user_request',
+            'posts_per_page' => -1,
+            'post_status'    => 'request-pending',
+            'fields'         => 'ids',
+            'date_query'     => array(
+                array(
+                    'column' => 'post_modified_gmt',
+                    'before' => $expires . ' seconds ago',
+                ),
+            ),
+        )
+    );
+
+    $request_ids = $requests_query->posts;
+
+    foreach ( $request_ids as $request_id ) {
+        wp_update_post(
+            array(
+                'ID'            => $request_id,
+                'post_status'   => 'request-failed',
+                'post_password' => '',
+            )
+        );
+    }
 }
 
 /**
@@ -250,54 +250,54 @@ 
  * @return string The HTML for this group and its items.
  */
 function wp_privacy_generate_personal_data_export_group_html( $group_data, $group_id = '', $groups_count = 1 ) {
-	$group_id_attr = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
+    $group_id_attr = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
 
-	$group_html  = '<h2 id="' . esc_attr( $group_id_attr ) . '">';
-	$group_html .= esc_html( $group_data['group_label'] );
+    $group_html  = '<h2 id="' . esc_attr( $group_id_attr ) . '">';
+    $group_html .= esc_html( $group_data['group_label'] );
 
-	$items_count = count( (array) $group_data['items'] );
-	if ( $items_count > 1 ) {
-		$group_html .= sprintf( ' <span class="count">(%d)</span>', $items_count );
-	}
+    $items_count = count( (array) $group_data['items'] );
+    if ( $items_count > 1 ) {
+        $group_html .= sprintf( ' <span class="count">(%d)</span>', $items_count );
+    }
 
-	$group_html .= '</h2>';
+    $group_html .= '</h2>';
 
-	if ( ! empty( $group_data['group_description'] ) ) {
-		$group_html .= '<p>' . esc_html( $group_data['group_description'] ) . '</p>';
-	}
+    if ( ! empty( $group_data['group_description'] ) ) {
+        $group_html .= '<p>' . esc_html( $group_data['group_description'] ) . '</p>';
+    }
 
-	$group_html .= '<div>';
+    $group_html .= '<div>';
 
-	foreach ( (array) $group_data['items'] as $group_item_id => $group_item_data ) {
-		$group_html .= '<table>';
-		$group_html .= '<tbody>';
+    foreach ( (array) $group_data['items'] as $group_item_id => $group_item_data ) {
+        $group_html .= '<table>';
+        $group_html .= '<tbody>';
 
-		foreach ( (array) $group_item_data as $group_item_datum ) {
-			$value = $group_item_datum['value'];
-			// If it looks like a link, make it a link.
-			if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
-				$value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
-			}
+        foreach ( (array) $group_item_data as $group_item_datum ) {
+            $value = $group_item_datum['value'];
+            // If it looks like a link, make it a link.
+            if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
+                $value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
+            }
 
-			$group_html .= '<tr>';
-			$group_html .= '<th>' . esc_html( $group_item_datum['name'] ) . '</th>';
-			$group_html .= '<td>' . wp_kses( $value, 'personal_data_export' ) . '</td>';
-			$group_html .= '</tr>';
-		}
+            $group_html .= '<tr>';
+            $group_html .= '<th>' . esc_html( $group_item_datum['name'] ) . '</th>';
+            $group_html .= '<td>' . wp_kses( $value, 'personal_data_export' ) . '</td>';
+            $group_html .= '</tr>';
+        }
 
-		$group_html .= '</tbody>';
-		$group_html .= '</table>';
-	}
+        $group_html .= '</tbody>';
+        $group_html .= '</table>';
+    }
 
-	if ( $groups_count > 1 ) {
-		$group_html .= '<div class="return-to-top">';
-		$group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Go to top' ) . '</a>';
-		$group_html .= '</div>';
-	}
+    if ( $groups_count > 1 ) {
+        $group_html .= '<div class="return-to-top">';
+        $group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Go to top' ) . '</a>';
+        $group_html .= '</div>';
+    }
 
-	$group_html .= '</div>';
+    $group_html .= '</div>';
 
-	return $group_html;
+    return $group_html;
 }
 
 /**
@@ -308,273 +308,273 @@ 
  * @param int $request_id The export request ID.
  */
 function wp_privacy_generate_personal_data_export_file( $request_id ) {
-	if ( ! class_exists( 'ZipArchive' ) ) {
-		wp_send_json_error( __( 'Unable to generate personal data export file. ZipArchive not available.' ) );
-	}
-
-	// Get the request.
-	$request = wp_get_user_request( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when generating personal data export file.' ) );
-	}
-
-	$email_address = $request->email;
-
-	if ( ! is_email( $email_address ) ) {
-		wp_send_json_error( __( 'Invalid email address when generating personal data export file.' ) );
-	}
-
-	// Create the exports folder if needed.
-	$exports_dir = wp_privacy_exports_dir();
-	$exports_url = wp_privacy_exports_url();
-
-	if ( ! wp_mkdir_p( $exports_dir ) ) {
-		wp_send_json_error( __( 'Unable to create personal data export folder.' ) );
-	}
-
-	// Protect export folder from browsing.
-	$index_pathname = $exports_dir . 'index.php';
-	if ( ! file_exists( $index_pathname ) ) {
-		$file = fopen( $index_pathname, 'w' );
-		if ( false === $file ) {
-			wp_send_json_error( __( 'Unable to protect personal data export folder from browsing.' ) );
-		}
-		fwrite( $file, "<?php\n// Silence is golden.\n" );
-		fclose( $file );
-	}
-
-	$obscura              = wp_generate_password( 32, false, false );
-	$file_basename        = 'wp-personal-data-file-' . $obscura;
-	$html_report_filename = wp_unique_filename( $exports_dir, $file_basename . '.html' );
-	$html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
-	$json_report_filename = $file_basename . '.json';
-	$json_report_pathname = wp_normalize_path( $exports_dir . $json_report_filename );
-
-	/*
+    if ( ! class_exists( 'ZipArchive' ) ) {
+        wp_send_json_error( __( 'Unable to generate personal data export file. ZipArchive not available.' ) );
+    }
+
+    // Get the request.
+    $request = wp_get_user_request( $request_id );
+
+    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+        wp_send_json_error( __( 'Invalid request ID when generating personal data export file.' ) );
+    }
+
+    $email_address = $request->email;
+
+    if ( ! is_email( $email_address ) ) {
+        wp_send_json_error( __( 'Invalid email address when generating personal data export file.' ) );
+    }
+
+    // Create the exports folder if needed.
+    $exports_dir = wp_privacy_exports_dir();
+    $exports_url = wp_privacy_exports_url();
+
+    if ( ! wp_mkdir_p( $exports_dir ) ) {
+        wp_send_json_error( __( 'Unable to create personal data export folder.' ) );
+    }
+
+    // Protect export folder from browsing.
+    $index_pathname = $exports_dir . 'index.php';
+    if ( ! file_exists( $index_pathname ) ) {
+        $file = fopen( $index_pathname, 'w' );
+        if ( false === $file ) {
+            wp_send_json_error( __( 'Unable to protect personal data export folder from browsing.' ) );
+        }
+        fwrite( $file, "<?php\n// Silence is golden.\n" );
+        fclose( $file );
+    }
+
+    $obscura              = wp_generate_password( 32, false, false );
+    $file_basename        = 'wp-personal-data-file-' . $obscura;
+    $html_report_filename = wp_unique_filename( $exports_dir, $file_basename . '.html' );
+    $html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
+    $json_report_filename = $file_basename . '.json';
+    $json_report_pathname = wp_normalize_path( $exports_dir . $json_report_filename );
+
+    /*
 	 * Gather general data needed.
 	 */
 
-	// Title.
-	$title = sprintf(
-		/* translators: %s: User's email address. */
-		__( 'Personal Data Export for %s' ),
-		$email_address
-	);
-
-	// First, build an "About" group on the fly for this report.
-	$about_group = array(
-		/* translators: Header for the About section in a personal data export. */
-		'group_label'       => _x( 'About', 'personal data group label' ),
-		/* translators: Description for the About section in a personal data export. */
-		'group_description' => _x( 'Overview of export report.', 'personal data group description' ),
-		'items'             => array(
-			'about-1' => array(
-				array(
-					'name'  => _x( 'Report generated for', 'email address' ),
-					'value' => $email_address,
-				),
-				array(
-					'name'  => _x( 'For site', 'website name' ),
-					'value' => get_bloginfo( 'name' ),
-				),
-				array(
-					'name'  => _x( 'At URL', 'website URL' ),
-					'value' => get_bloginfo( 'url' ),
-				),
-				array(
-					'name'  => _x( 'On', 'date/time' ),
-					'value' => current_time( 'mysql' ),
-				),
-			),
-		),
-	);
-
-	// And now, all the Groups.
-	$groups = get_post_meta( $request_id, '_export_data_grouped', true );
-	if ( is_array( $groups ) ) {
-		// Merge in the special "About" group.
-		$groups       = array_merge( array( 'about' => $about_group ), $groups );
-		$groups_count = count( $groups );
-	} else {
-		if ( false !== $groups ) {
-			_doing_it_wrong(
-				__FUNCTION__,
-				/* translators: %s: Post meta key. */
-				sprintf( __( 'The %s post meta must be an array.' ), '<code>_export_data_grouped</code>' ),
-				'5.8.0'
-			);
-		}
-
-		$groups       = null;
-		$groups_count = 0;
-	}
-
-	// Convert the groups to JSON format.
-	$groups_json = wp_json_encode( $groups );
-
-	if ( false === $groups_json ) {
-		$error_message = sprintf(
-			/* translators: %s: Error message. */
-			__( 'Unable to encode the personal data for export. Error: %s' ),
-			json_last_error_msg()
-		);
-
-		wp_send_json_error( $error_message );
-	}
-
-	/*
+    // Title.
+    $title = sprintf(
+        /* translators: %s: User's email address. */
+        __( 'Personal Data Export for %s' ),
+        $email_address
+    );
+
+    // First, build an "About" group on the fly for this report.
+    $about_group = array(
+        /* translators: Header for the About section in a personal data export. */
+        'group_label'       => _x( 'About', 'personal data group label' ),
+        /* translators: Description for the About section in a personal data export. */
+        'group_description' => _x( 'Overview of export report.', 'personal data group description' ),
+        'items'             => array(
+            'about-1' => array(
+                array(
+                    'name'  => _x( 'Report generated for', 'email address' ),
+                    'value' => $email_address,
+                ),
+                array(
+                    'name'  => _x( 'For site', 'website name' ),
+                    'value' => get_bloginfo( 'name' ),
+                ),
+                array(
+                    'name'  => _x( 'At URL', 'website URL' ),
+                    'value' => get_bloginfo( 'url' ),
+                ),
+                array(
+                    'name'  => _x( 'On', 'date/time' ),
+                    'value' => current_time( 'mysql' ),
+                ),
+            ),
+        ),
+    );
+
+    // And now, all the Groups.
+    $groups = get_post_meta( $request_id, '_export_data_grouped', true );
+    if ( is_array( $groups ) ) {
+        // Merge in the special "About" group.
+        $groups       = array_merge( array( 'about' => $about_group ), $groups );
+        $groups_count = count( $groups );
+    } else {
+        if ( false !== $groups ) {
+            _doing_it_wrong(
+                __FUNCTION__,
+                /* translators: %s: Post meta key. */
+                sprintf( __( 'The %s post meta must be an array.' ), '<code>_export_data_grouped</code>' ),
+                '5.8.0'
+            );
+        }
+
+        $groups       = null;
+        $groups_count = 0;
+    }
+
+    // Convert the groups to JSON format.
+    $groups_json = wp_json_encode( $groups );
+
+    if ( false === $groups_json ) {
+        $error_message = sprintf(
+            /* translators: %s: Error message. */
+            __( 'Unable to encode the personal data for export. Error: %s' ),
+            json_last_error_msg()
+        );
+
+        wp_send_json_error( $error_message );
+    }
+
+    /*
 	 * Handle the JSON export.
 	 */
-	$file = fopen( $json_report_pathname, 'w' );
+    $file = fopen( $json_report_pathname, 'w' );
 
-	if ( false === $file ) {
-		wp_send_json_error( __( 'Unable to open personal data export file (JSON report) for writing.' ) );
-	}
+    if ( false === $file ) {
+        wp_send_json_error( __( 'Unable to open personal data export file (JSON report) for writing.' ) );
+    }
 
-	fwrite( $file, '{' );
-	fwrite( $file, '"' . $title . '":' );
-	fwrite( $file, $groups_json );
-	fwrite( $file, '}' );
-	fclose( $file );
+    fwrite( $file, '{' );
+    fwrite( $file, '"' . $title . '":' );
+    fwrite( $file, $groups_json );
+    fwrite( $file, '}' );
+    fclose( $file );
 
-	/*
+    /*
 	 * Handle the HTML export.
 	 */
-	$file = fopen( $html_report_pathname, 'w' );
-
-	if ( false === $file ) {
-		wp_send_json_error( __( 'Unable to open personal data export (HTML report) for writing.' ) );
-	}
-
-	fwrite( $file, "<!DOCTYPE html>\n" );
-	fwrite( $file, "<html>\n" );
-	fwrite( $file, "<head>\n" );
-	fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
-	fwrite( $file, "<style type='text/css'>" );
-	fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
-	fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
-	fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );
-	fwrite( $file, 'td { padding: 5px; }' );
-	fwrite( $file, 'tr:nth-child(odd) { background-color: #fafafa; }' );
-	fwrite( $file, '.return-to-top { text-align: right; }' );
-	fwrite( $file, '</style>' );
-	fwrite( $file, '<title>' );
-	fwrite( $file, esc_html( $title ) );
-	fwrite( $file, '</title>' );
-	fwrite( $file, "</head>\n" );
-	fwrite( $file, "<body>\n" );
-	fwrite( $file, '<h1 id="top">' . esc_html__( 'Personal Data Export' ) . '</h1>' );
-
-	// Create TOC.
-	if ( $groups_count > 1 ) {
-		fwrite( $file, '<div id="table_of_contents">' );
-		fwrite( $file, '<h2>' . esc_html__( 'Table of Contents' ) . '</h2>' );
-		fwrite( $file, '<ul>' );
-		foreach ( (array) $groups as $group_id => $group_data ) {
-			$group_label       = esc_html( $group_data['group_label'] );
-			$group_id_attr     = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
-			$group_items_count = count( (array) $group_data['items'] );
-			if ( $group_items_count > 1 ) {
-				$group_label .= sprintf( ' <span class="count">(%d)</span>', $group_items_count );
-			}
-			fwrite( $file, '<li>' );
-			fwrite( $file, '<a href="#' . esc_attr( $group_id_attr ) . '">' . $group_label . '</a>' );
-			fwrite( $file, '</li>' );
-		}
-		fwrite( $file, '</ul>' );
-		fwrite( $file, '</div>' );
-	}
-
-	// Now, iterate over every group in $groups and have the formatter render it in HTML.
-	foreach ( (array) $groups as $group_id => $group_data ) {
-		fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data, $group_id, $groups_count ) );
-	}
-
-	fwrite( $file, "</body>\n" );
-	fwrite( $file, "</html>\n" );
-	fclose( $file );
-
-	/*
+    $file = fopen( $html_report_pathname, 'w' );
+
+    if ( false === $file ) {
+        wp_send_json_error( __( 'Unable to open personal data export (HTML report) for writing.' ) );
+    }
+
+    fwrite( $file, "<!DOCTYPE html>\n" );
+    fwrite( $file, "<html>\n" );
+    fwrite( $file, "<head>\n" );
+    fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
+    fwrite( $file, "<style type='text/css'>" );
+    fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
+    fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
+    fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );
+    fwrite( $file, 'td { padding: 5px; }' );
+    fwrite( $file, 'tr:nth-child(odd) { background-color: #fafafa; }' );
+    fwrite( $file, '.return-to-top { text-align: right; }' );
+    fwrite( $file, '</style>' );
+    fwrite( $file, '<title>' );
+    fwrite( $file, esc_html( $title ) );
+    fwrite( $file, '</title>' );
+    fwrite( $file, "</head>\n" );
+    fwrite( $file, "<body>\n" );
+    fwrite( $file, '<h1 id="top">' . esc_html__( 'Personal Data Export' ) . '</h1>' );
+
+    // Create TOC.
+    if ( $groups_count > 1 ) {
+        fwrite( $file, '<div id="table_of_contents">' );
+        fwrite( $file, '<h2>' . esc_html__( 'Table of Contents' ) . '</h2>' );
+        fwrite( $file, '<ul>' );
+        foreach ( (array) $groups as $group_id => $group_data ) {
+            $group_label       = esc_html( $group_data['group_label'] );
+            $group_id_attr     = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
+            $group_items_count = count( (array) $group_data['items'] );
+            if ( $group_items_count > 1 ) {
+                $group_label .= sprintf( ' <span class="count">(%d)</span>', $group_items_count );
+            }
+            fwrite( $file, '<li>' );
+            fwrite( $file, '<a href="#' . esc_attr( $group_id_attr ) . '">' . $group_label . '</a>' );
+            fwrite( $file, '</li>' );
+        }
+        fwrite( $file, '</ul>' );
+        fwrite( $file, '</div>' );
+    }
+
+    // Now, iterate over every group in $groups and have the formatter render it in HTML.
+    foreach ( (array) $groups as $group_id => $group_data ) {
+        fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data, $group_id, $groups_count ) );
+    }
+
+    fwrite( $file, "</body>\n" );
+    fwrite( $file, "</html>\n" );
+    fclose( $file );
+
+    /*
 	 * Now, generate the ZIP.
 	 *
 	 * If an archive has already been generated, then remove it and reuse the filename,
 	 * to avoid breaking any URLs that may have been previously sent via email.
 	 */
-	$error = false;
-
-	// This meta value is used from version 5.5.
-	$archive_filename = get_post_meta( $request_id, '_export_file_name', true );
-
-	// This one stored an absolute path and is used for backward compatibility.
-	$archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
-
-	// If a filename meta exists, use it.
-	if ( ! empty( $archive_filename ) ) {
-		$archive_pathname = $exports_dir . $archive_filename;
-	} elseif ( ! empty( $archive_pathname ) ) {
-		// If a full path meta exists, use it and create the new meta value.
-		$archive_filename = basename( $archive_pathname );
-
-		update_post_meta( $request_id, '_export_file_name', $archive_filename );
-
-		// Remove the back-compat meta values.
-		delete_post_meta( $request_id, '_export_file_url' );
-		delete_post_meta( $request_id, '_export_file_path' );
-	} else {
-		// If there's no filename or full path stored, create a new file.
-		$archive_filename = $file_basename . '.zip';
-		$archive_pathname = $exports_dir . $archive_filename;
-
-		update_post_meta( $request_id, '_export_file_name', $archive_filename );
-	}
-
-	$archive_url = $exports_url . $archive_filename;
-
-	if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
-		wp_delete_file( $archive_pathname );
-	}
-
-	$zip = new ZipArchive;
-	if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
-		if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
-			$error = __( 'Unable to archive the personal data export file (JSON format).' );
-		}
-
-		if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
-			$error = __( 'Unable to archive the personal data export file (HTML format).' );
-		}
-
-		$zip->close();
-
-		if ( ! $error ) {
-			/**
-			 * Fires right after all personal data has been written to the export file.
-			 *
-			 * @since 4.9.6
-			 * @since 5.4.0 Added the `$json_report_pathname` parameter.
-			 *
-			 * @param string $archive_pathname     The full path to the export file on the filesystem.
-			 * @param string $archive_url          The URL of the archive file.
-			 * @param string $html_report_pathname The full path to the HTML personal data report on the filesystem.
-			 * @param int    $request_id           The export request ID.
-			 * @param string $json_report_pathname The full path to the JSON personal data report on the filesystem.
-			 */
-			do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id, $json_report_pathname );
-		}
-	} else {
-		$error = __( 'Unable to open personal data export file (archive) for writing.' );
-	}
-
-	// Remove the JSON file.
-	unlink( $json_report_pathname );
-
-	// Remove the HTML file.
-	unlink( $html_report_pathname );
-
-	if ( $error ) {
-		wp_send_json_error( $error );
-	}
+    $error = false;
+
+    // This meta value is used from version 5.5.
+    $archive_filename = get_post_meta( $request_id, '_export_file_name', true );
+
+    // This one stored an absolute path and is used for backward compatibility.
+    $archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
+
+    // If a filename meta exists, use it.
+    if ( ! empty( $archive_filename ) ) {
+        $archive_pathname = $exports_dir . $archive_filename;
+    } elseif ( ! empty( $archive_pathname ) ) {
+        // If a full path meta exists, use it and create the new meta value.
+        $archive_filename = basename( $archive_pathname );
+
+        update_post_meta( $request_id, '_export_file_name', $archive_filename );
+
+        // Remove the back-compat meta values.
+        delete_post_meta( $request_id, '_export_file_url' );
+        delete_post_meta( $request_id, '_export_file_path' );
+    } else {
+        // If there's no filename or full path stored, create a new file.
+        $archive_filename = $file_basename . '.zip';
+        $archive_pathname = $exports_dir . $archive_filename;
+
+        update_post_meta( $request_id, '_export_file_name', $archive_filename );
+    }
+
+    $archive_url = $exports_url . $archive_filename;
+
+    if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
+        wp_delete_file( $archive_pathname );
+    }
+
+    $zip = new ZipArchive;
+    if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
+        if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
+            $error = __( 'Unable to archive the personal data export file (JSON format).' );
+        }
+
+        if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
+            $error = __( 'Unable to archive the personal data export file (HTML format).' );
+        }
+
+        $zip->close();
+
+        if ( ! $error ) {
+            /**
+             * Fires right after all personal data has been written to the export file.
+             *
+             * @since 4.9.6
+             * @since 5.4.0 Added the `$json_report_pathname` parameter.
+             *
+             * @param string $archive_pathname     The full path to the export file on the filesystem.
+             * @param string $archive_url          The URL of the archive file.
+             * @param string $html_report_pathname The full path to the HTML personal data report on the filesystem.
+             * @param int    $request_id           The export request ID.
+             * @param string $json_report_pathname The full path to the JSON personal data report on the filesystem.
+             */
+            do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id, $json_report_pathname );
+        }
+    } else {
+        $error = __( 'Unable to open personal data export file (archive) for writing.' );
+    }
+
+    // Remove the JSON file.
+    unlink( $json_report_pathname );
+
+    // Remove the HTML file.
+    unlink( $html_report_pathname );
+
+    if ( $error ) {
+        wp_send_json_error( $error );
+    }
 }
 
 /**
@@ -586,83 +586,83 @@ 
  * @return true|WP_Error True on success or `WP_Error` on failure.
  */
 function wp_privacy_send_personal_data_export_email( $request_id ) {
-	// Get the request.
-	$request = wp_get_user_request( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) );
-	}
-
-	// Localize message content for user; fallback to site default for visitors.
-	if ( ! empty( $request->user_id ) ) {
-		$locale = get_user_locale( $request->user_id );
-	} else {
-		$locale = get_locale();
-	}
-
-	$switched_locale = switch_to_locale( $locale );
-
-	/** This filter is documented in wp-includes/functions.php */
-	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
-	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
-
-	$exports_url      = wp_privacy_exports_url();
-	$export_file_name = get_post_meta( $request_id, '_export_file_name', true );
-	$export_file_url  = $exports_url . $export_file_name;
-
-	$site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	$site_url  = home_url();
-
-	/**
-	 * Filters the recipient of the personal data export email notification.
-	 * Should be used with great caution to avoid sending the data export link to wrong emails.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param string          $request_email The email address of the notification recipient.
-	 * @param WP_User_Request $request       The request that is initiating the notification.
-	 */
-	$request_email = apply_filters( 'wp_privacy_personal_data_email_to', $request->email, $request );
-
-	$email_data = array(
-		'request'           => $request,
-		'expiration'        => $expiration,
-		'expiration_date'   => $expiration_date,
-		'message_recipient' => $request_email,
-		'export_file_url'   => $export_file_url,
-		'sitename'          => $site_name,
-		'siteurl'           => $site_url,
-	);
-
-	/* translators: Personal data export notification email subject. %s: Site title. */
-	$subject = sprintf( __( '[%s] Personal Data Export' ), $site_name );
-
-	/**
-	 * Filters the subject of the email sent when an export request is completed.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param string $subject    The email subject.
-	 * @param string $sitename   The name of the site.
-	 * @param array  $email_data {
-	 *     Data relating to the account action email.
-	 *
-	 *     @type WP_User_Request $request           User request object.
-	 *     @type int             $expiration        The time in seconds until the export file expires.
-	 *     @type string          $expiration_date   The localized date and time when the export file expires.
-	 *     @type string          $message_recipient The address that the email will be sent to. Defaults
-	 *                                              to the value of `$request->email`, but can be changed
-	 *                                              by the `wp_privacy_personal_data_email_to` filter.
-	 *     @type string          $export_file_url   The export file URL.
-	 *     @type string          $sitename          The site name sending the mail.
-	 *     @type string          $siteurl           The site URL sending the mail.
-	 * }
-	 */
-	$subject = apply_filters( 'wp_privacy_personal_data_email_subject', $subject, $site_name, $email_data );
-
-	/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __(
-		'Howdy,
+    // Get the request.
+    $request = wp_get_user_request( $request_id );
+
+    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+        return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) );
+    }
+
+    // Localize message content for user; fallback to site default for visitors.
+    if ( ! empty( $request->user_id ) ) {
+        $locale = get_user_locale( $request->user_id );
+    } else {
+        $locale = get_locale();
+    }
+
+    $switched_locale = switch_to_locale( $locale );
+
+    /** This filter is documented in wp-includes/functions.php */
+    $expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
+    $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
+
+    $exports_url      = wp_privacy_exports_url();
+    $export_file_name = get_post_meta( $request_id, '_export_file_name', true );
+    $export_file_url  = $exports_url . $export_file_name;
+
+    $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $site_url  = home_url();
+
+    /**
+     * Filters the recipient of the personal data export email notification.
+     * Should be used with great caution to avoid sending the data export link to wrong emails.
+     *
+     * @since 5.3.0
+     *
+     * @param string          $request_email The email address of the notification recipient.
+     * @param WP_User_Request $request       The request that is initiating the notification.
+     */
+    $request_email = apply_filters( 'wp_privacy_personal_data_email_to', $request->email, $request );
+
+    $email_data = array(
+        'request'           => $request,
+        'expiration'        => $expiration,
+        'expiration_date'   => $expiration_date,
+        'message_recipient' => $request_email,
+        'export_file_url'   => $export_file_url,
+        'sitename'          => $site_name,
+        'siteurl'           => $site_url,
+    );
+
+    /* translators: Personal data export notification email subject. %s: Site title. */
+    $subject = sprintf( __( '[%s] Personal Data Export' ), $site_name );
+
+    /**
+     * Filters the subject of the email sent when an export request is completed.
+     *
+     * @since 5.3.0
+     *
+     * @param string $subject    The email subject.
+     * @param string $sitename   The name of the site.
+     * @param array  $email_data {
+     *     Data relating to the account action email.
+     *
+     *     @type WP_User_Request $request           User request object.
+     *     @type int             $expiration        The time in seconds until the export file expires.
+     *     @type string          $expiration_date   The localized date and time when the export file expires.
+     *     @type string          $message_recipient The address that the email will be sent to. Defaults
+     *                                              to the value of `$request->email`, but can be changed
+     *                                              by the `wp_privacy_personal_data_email_to` filter.
+     *     @type string          $export_file_url   The export file URL.
+     *     @type string          $sitename          The site name sending the mail.
+     *     @type string          $siteurl           The site URL sending the mail.
+     * }
+     */
+    $subject = apply_filters( 'wp_privacy_personal_data_email_subject', $subject, $site_name, $email_data );
+
+    /* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
+    $email_text = __(
+        'Howdy,
 
 Your request for an export of personal data has been completed. You may
 download your personal data by clicking on the link below. For privacy
@@ -674,81 +674,81 @@ 
 Regards,
 All at ###SITENAME###
 ###SITEURL###'
-	);
-
-	/**
-	 * Filters the text of the email sent with a personal data export file.
-	 *
-	 * The following strings have a special meaning and will get replaced dynamically:
-	 * ###EXPIRATION###         The date when the URL will be automatically deleted.
-	 * ###LINK###               URL of the personal data export file for the user.
-	 * ###SITENAME###           The name of the site.
-	 * ###SITEURL###            The URL to the site.
-	 *
-	 * @since 4.9.6
-	 * @since 5.3.0 Introduced the `$email_data` array.
-	 *
-	 * @param string $email_text Text in the email.
-	 * @param int    $request_id The request ID for this personal data export.
-	 * @param array  $email_data {
-	 *     Data relating to the account action email.
-	 *
-	 *     @type WP_User_Request $request           User request object.
-	 *     @type int             $expiration        The time in seconds until the export file expires.
-	 *     @type string          $expiration_date   The localized date and time when the export file expires.
-	 *     @type string          $message_recipient The address that the email will be sent to. Defaults
-	 *                                              to the value of `$request->email`, but can be changed
-	 *                                              by the `wp_privacy_personal_data_email_to` filter.
-	 *     @type string          $export_file_url   The export file URL.
-	 *     @type string          $sitename          The site name sending the mail.
-	 *     @type string          $siteurl           The site URL sending the mail.
-	 */
-	$content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id, $email_data );
-
-	$content = str_replace( '###EXPIRATION###', $expiration_date, $content );
-	$content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
-	$content = str_replace( '###EMAIL###', $request_email, $content );
-	$content = str_replace( '###SITENAME###', $site_name, $content );
-	$content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
-
-	$headers = '';
-
-	/**
-	 * Filters the headers of the email sent with a personal data export file.
-	 *
-	 * @since 5.4.0
-	 *
-	 * @param string|array $headers    The email headers.
-	 * @param string       $subject    The email subject.
-	 * @param string       $content    The email content.
-	 * @param int          $request_id The request ID.
-	 * @param array        $email_data {
-	 *     Data relating to the account action email.
-	 *
-	 *     @type WP_User_Request $request           User request object.
-	 *     @type int             $expiration        The time in seconds until the export file expires.
-	 *     @type string          $expiration_date   The localized date and time when the export file expires.
-	 *     @type string          $message_recipient The address that the email will be sent to. Defaults
-	 *                                              to the value of `$request->email`, but can be changed
-	 *                                              by the `wp_privacy_personal_data_email_to` filter.
-	 *     @type string          $export_file_url   The export file URL.
-	 *     @type string          $sitename          The site name sending the mail.
-	 *     @type string          $siteurl           The site URL sending the mail.
-	 * }
-	 */
-	$headers = apply_filters( 'wp_privacy_personal_data_email_headers', $headers, $subject, $content, $request_id, $email_data );
-
-	$mail_success = wp_mail( $request_email, $subject, $content, $headers );
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
-
-	if ( ! $mail_success ) {
-		return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export email.' ) );
-	}
-
-	return true;
+    );
+
+    /**
+     * Filters the text of the email sent with a personal data export file.
+     *
+     * The following strings have a special meaning and will get replaced dynamically:
+     * ###EXPIRATION###         The date when the URL will be automatically deleted.
+     * ###LINK###               URL of the personal data export file for the user.
+     * ###SITENAME###           The name of the site.
+     * ###SITEURL###            The URL to the site.
+     *
+     * @since 4.9.6
+     * @since 5.3.0 Introduced the `$email_data` array.
+     *
+     * @param string $email_text Text in the email.
+     * @param int    $request_id The request ID for this personal data export.
+     * @param array  $email_data {
+     *     Data relating to the account action email.
+     *
+     *     @type WP_User_Request $request           User request object.
+     *     @type int             $expiration        The time in seconds until the export file expires.
+     *     @type string          $expiration_date   The localized date and time when the export file expires.
+     *     @type string          $message_recipient The address that the email will be sent to. Defaults
+     *                                              to the value of `$request->email`, but can be changed
+     *                                              by the `wp_privacy_personal_data_email_to` filter.
+     *     @type string          $export_file_url   The export file URL.
+     *     @type string          $sitename          The site name sending the mail.
+     *     @type string          $siteurl           The site URL sending the mail.
+     */
+    $content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id, $email_data );
+
+    $content = str_replace( '###EXPIRATION###', $expiration_date, $content );
+    $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
+    $content = str_replace( '###EMAIL###', $request_email, $content );
+    $content = str_replace( '###SITENAME###', $site_name, $content );
+    $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
+
+    $headers = '';
+
+    /**
+     * Filters the headers of the email sent with a personal data export file.
+     *
+     * @since 5.4.0
+     *
+     * @param string|array $headers    The email headers.
+     * @param string       $subject    The email subject.
+     * @param string       $content    The email content.
+     * @param int          $request_id The request ID.
+     * @param array        $email_data {
+     *     Data relating to the account action email.
+     *
+     *     @type WP_User_Request $request           User request object.
+     *     @type int             $expiration        The time in seconds until the export file expires.
+     *     @type string          $expiration_date   The localized date and time when the export file expires.
+     *     @type string          $message_recipient The address that the email will be sent to. Defaults
+     *                                              to the value of `$request->email`, but can be changed
+     *                                              by the `wp_privacy_personal_data_email_to` filter.
+     *     @type string          $export_file_url   The export file URL.
+     *     @type string          $sitename          The site name sending the mail.
+     *     @type string          $siteurl           The site URL sending the mail.
+     * }
+     */
+    $headers = apply_filters( 'wp_privacy_personal_data_email_headers', $headers, $subject, $content, $request_id, $email_data );
+
+    $mail_success = wp_mail( $request_email, $subject, $content, $headers );
+
+    if ( $switched_locale ) {
+        restore_previous_locale();
+    }
+
+    if ( ! $mail_success ) {
+        return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export email.' ) );
+    }
+
+    return true;
 }
 
 /**
@@ -768,127 +768,127 @@ 
  * @return array The filtered response.
  */
 function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
-	/* Do some simple checks on the shape of the response from the exporter.
+    /* Do some simple checks on the shape of the response from the exporter.
 	 * If the exporter response is malformed, don't attempt to consume it - let it
 	 * pass through to generate a warning to the user by default Ajax processing.
 	 */
-	if ( ! is_array( $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'done', $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'data', $response ) ) {
-		return $response;
-	}
-
-	if ( ! is_array( $response['data'] ) ) {
-		return $response;
-	}
-
-	// Get the request.
-	$request = wp_get_user_request( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when merging personal data to export.' ) );
-	}
-
-	$export_data = array();
-
-	// First exporter, first page? Reset the report data accumulation array.
-	if ( 1 === $exporter_index && 1 === $page ) {
-		update_post_meta( $request_id, '_export_data_raw', $export_data );
-	} else {
-		$accumulated_data = get_post_meta( $request_id, '_export_data_raw', true );
-
-		if ( $accumulated_data ) {
-			$export_data = $accumulated_data;
-		}
-	}
-
-	// Now, merge the data from the exporter response into the data we have accumulated already.
-	$export_data = array_merge( $export_data, $response['data'] );
-	update_post_meta( $request_id, '_export_data_raw', $export_data );
-
-	// If we are not yet on the last page of the last exporter, return now.
-	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$exporters        = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-	$is_last_exporter = count( $exporters ) === $exporter_index;
-	$exporter_done    = $response['done'];
-	if ( ! $is_last_exporter || ! $exporter_done ) {
-		return $response;
-	}
-
-	// Last exporter, last page - let's prepare the export file.
-
-	// First we need to re-organize the raw data hierarchically in groups and items.
-	$groups = array();
-	foreach ( (array) $export_data as $export_datum ) {
-		$group_id    = $export_datum['group_id'];
-		$group_label = $export_datum['group_label'];
-
-		$group_description = '';
-		if ( ! empty( $export_datum['group_description'] ) ) {
-			$group_description = $export_datum['group_description'];
-		}
-
-		if ( ! array_key_exists( $group_id, $groups ) ) {
-			$groups[ $group_id ] = array(
-				'group_label'       => $group_label,
-				'group_description' => $group_description,
-				'items'             => array(),
-			);
-		}
-
-		$item_id = $export_datum['item_id'];
-		if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) {
-			$groups[ $group_id ]['items'][ $item_id ] = array();
-		}
-
-		$old_item_data                            = $groups[ $group_id ]['items'][ $item_id ];
-		$merged_item_data                         = array_merge( $export_datum['data'], $old_item_data );
-		$groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
-	}
-
-	// Then save the grouped data into the request.
-	delete_post_meta( $request_id, '_export_data_raw' );
-	update_post_meta( $request_id, '_export_data_grouped', $groups );
-
-	/**
-	 * Generate the export file from the collected, grouped personal data.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param int $request_id The export request ID.
-	 */
-	do_action( 'wp_privacy_personal_data_export_file', $request_id );
-
-	// Clear the grouped data now that it is no longer needed.
-	delete_post_meta( $request_id, '_export_data_grouped' );
-
-	// If the destination is email, send it now.
-	if ( $send_as_email ) {
-		$mail_success = wp_privacy_send_personal_data_export_email( $request_id );
-		if ( is_wp_error( $mail_success ) ) {
-			wp_send_json_error( $mail_success->get_error_message() );
-		}
-
-		// Update the request to completed state when the export email is sent.
-		_wp_privacy_completed_request( $request_id );
-	} else {
-		// Modify the response to include the URL of the export file so the browser can fetch it.
-		$exports_url      = wp_privacy_exports_url();
-		$export_file_name = get_post_meta( $request_id, '_export_file_name', true );
-		$export_file_url  = $exports_url . $export_file_name;
-
-		if ( ! empty( $export_file_url ) ) {
-			$response['url'] = $export_file_url;
-		}
-	}
-
-	return $response;
+    if ( ! is_array( $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'done', $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'data', $response ) ) {
+        return $response;
+    }
+
+    if ( ! is_array( $response['data'] ) ) {
+        return $response;
+    }
+
+    // Get the request.
+    $request = wp_get_user_request( $request_id );
+
+    if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+        wp_send_json_error( __( 'Invalid request ID when merging personal data to export.' ) );
+    }
+
+    $export_data = array();
+
+    // First exporter, first page? Reset the report data accumulation array.
+    if ( 1 === $exporter_index && 1 === $page ) {
+        update_post_meta( $request_id, '_export_data_raw', $export_data );
+    } else {
+        $accumulated_data = get_post_meta( $request_id, '_export_data_raw', true );
+
+        if ( $accumulated_data ) {
+            $export_data = $accumulated_data;
+        }
+    }
+
+    // Now, merge the data from the exporter response into the data we have accumulated already.
+    $export_data = array_merge( $export_data, $response['data'] );
+    update_post_meta( $request_id, '_export_data_raw', $export_data );
+
+    // If we are not yet on the last page of the last exporter, return now.
+    /** This filter is documented in wp-admin/includes/ajax-actions.php */
+    $exporters        = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+    $is_last_exporter = count( $exporters ) === $exporter_index;
+    $exporter_done    = $response['done'];
+    if ( ! $is_last_exporter || ! $exporter_done ) {
+        return $response;
+    }
+
+    // Last exporter, last page - let's prepare the export file.
+
+    // First we need to re-organize the raw data hierarchically in groups and items.
+    $groups = array();
+    foreach ( (array) $export_data as $export_datum ) {
+        $group_id    = $export_datum['group_id'];
+        $group_label = $export_datum['group_label'];
+
+        $group_description = '';
+        if ( ! empty( $export_datum['group_description'] ) ) {
+            $group_description = $export_datum['group_description'];
+        }
+
+        if ( ! array_key_exists( $group_id, $groups ) ) {
+            $groups[ $group_id ] = array(
+                'group_label'       => $group_label,
+                'group_description' => $group_description,
+                'items'             => array(),
+            );
+        }
+
+        $item_id = $export_datum['item_id'];
+        if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) {
+            $groups[ $group_id ]['items'][ $item_id ] = array();
+        }
+
+        $old_item_data                            = $groups[ $group_id ]['items'][ $item_id ];
+        $merged_item_data                         = array_merge( $export_datum['data'], $old_item_data );
+        $groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
+    }
+
+    // Then save the grouped data into the request.
+    delete_post_meta( $request_id, '_export_data_raw' );
+    update_post_meta( $request_id, '_export_data_grouped', $groups );
+
+    /**
+     * Generate the export file from the collected, grouped personal data.
+     *
+     * @since 4.9.6
+     *
+     * @param int $request_id The export request ID.
+     */
+    do_action( 'wp_privacy_personal_data_export_file', $request_id );
+
+    // Clear the grouped data now that it is no longer needed.
+    delete_post_meta( $request_id, '_export_data_grouped' );
+
+    // If the destination is email, send it now.
+    if ( $send_as_email ) {
+        $mail_success = wp_privacy_send_personal_data_export_email( $request_id );
+        if ( is_wp_error( $mail_success ) ) {
+            wp_send_json_error( $mail_success->get_error_message() );
+        }
+
+        // Update the request to completed state when the export email is sent.
+        _wp_privacy_completed_request( $request_id );
+    } else {
+        // Modify the response to include the URL of the export file so the browser can fetch it.
+        $exports_url      = wp_privacy_exports_url();
+        $export_file_name = get_post_meta( $request_id, '_export_file_name', true );
+        $export_file_url  = $exports_url . $export_file_name;
+
+        if ( ! empty( $export_file_url ) ) {
+            $response['url'] = $export_file_url;
+        }
+    }
+
+    return $response;
 }
 
 /**
@@ -914,57 +914,57 @@ 
  * @return array The filtered response.
  */
 function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index, $email_address, $page, $request_id ) {
-	/*
+    /*
 	 * If the eraser response is malformed, don't attempt to consume it; let it
 	 * pass through, so that the default Ajax processing will generate a warning
 	 * to the user.
 	 */
-	if ( ! is_array( $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'done', $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'items_removed', $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'items_retained', $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'messages', $response ) ) {
-		return $response;
-	}
-
-	// Get the request.
-	$request = wp_get_user_request( $request_id );
-
-	if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when processing personal data to erase.' ) );
-	}
-
-	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$erasers        = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-	$is_last_eraser = count( $erasers ) === $eraser_index;
-	$eraser_done    = $response['done'];
-
-	if ( ! $is_last_eraser || ! $eraser_done ) {
-		return $response;
-	}
-
-	_wp_privacy_completed_request( $request_id );
-
-	/**
-	 * Fires immediately after a personal data erasure request has been marked completed.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param int $request_id The privacy request post ID associated with this request.
-	 */
-	do_action( 'wp_privacy_personal_data_erased', $request_id );
-
-	return $response;
+    if ( ! is_array( $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'done', $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'items_removed', $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'items_retained', $response ) ) {
+        return $response;
+    }
+
+    if ( ! array_key_exists( 'messages', $response ) ) {
+        return $response;
+    }
+
+    // Get the request.
+    $request = wp_get_user_request( $request_id );
+
+    if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
+        wp_send_json_error( __( 'Invalid request ID when processing personal data to erase.' ) );
+    }
+
+    /** This filter is documented in wp-admin/includes/ajax-actions.php */
+    $erasers        = apply_filters( 'wp_privacy_personal_data_erasers', array() );
+    $is_last_eraser = count( $erasers ) === $eraser_index;
+    $eraser_done    = $response['done'];
+
+    if ( ! $is_last_eraser || ! $eraser_done ) {
+        return $response;
+    }
+
+    _wp_privacy_completed_request( $request_id );
+
+    /**
+     * Fires immediately after a personal data erasure request has been marked completed.
+     *
+     * @since 4.9.6
+     *
+     * @param int $request_id The privacy request post ID associated with this request.
+     */
+    do_action( 'wp_privacy_personal_data_erased', $request_id );
+
+    return $response;
 }

Spacing +258 added lines, -258 removed lines

@@ -15,20 +15,20 @@ 
  * @param int $request_id Request ID.
  * @return true|WP_Error Returns true if sending the email was successful, or a WP_Error object.
  */
-function _wp_privacy_resend_request( $request_id ) {
-	$request_id = absint( $request_id );
-	$request    = get_post( $request_id );
+function _wp_privacy_resend_request($request_id) {
+	$request_id = absint($request_id);
+	$request    = get_post($request_id);
 
-	if ( ! $request || 'user_request' !== $request->post_type ) {
-		return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
+	if (!$request || 'user_request' !== $request->post_type) {
+		return new WP_Error('privacy_request_error', __('Invalid personal data request.'));
 	}
 
-	$result = wp_send_user_request( $request_id );
+	$result = wp_send_user_request($request_id);
 
-	if ( is_wp_error( $result ) ) {
+	if (is_wp_error($result)) {
 		return $result;
-	} elseif ( ! $result ) {
-		return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation for personal data request.' ) );
+	} elseif (!$result) {
+		return new WP_Error('privacy_request_error', __('Unable to initiate confirmation for personal data request.'));
 	}
 
 	return true;
@@ -43,16 +43,16 @@ 
  * @param int $request_id Request ID.
  * @return int|WP_Error Request ID on success, or a WP_Error on failure.
  */
-function _wp_privacy_completed_request( $request_id ) {
+function _wp_privacy_completed_request($request_id) {
 	// Get the request.
-	$request_id = absint( $request_id );
-	$request    = wp_get_user_request( $request_id );
+	$request_id = absint($request_id);
+	$request    = wp_get_user_request($request_id);
 
-	if ( ! $request ) {
-		return new WP_Error( 'privacy_request_error', __( 'Invalid personal data request.' ) );
+	if (!$request) {
+		return new WP_Error('privacy_request_error', __('Invalid personal data request.'));
 	}
 
-	update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
+	update_post_meta($request_id, '_wp_user_request_completed_timestamp', time());
 
 	$result = wp_update_post(
 		array(
@@ -71,13 +71,13 @@ 
  * @access private
  */
 function _wp_personal_data_handle_actions() {
-	if ( isset( $_POST['privacy_action_email_retry'] ) ) {
-		check_admin_referer( 'bulk-privacy_requests' );
+	if (isset($_POST['privacy_action_email_retry'])) {
+		check_admin_referer('bulk-privacy_requests');
 
-		$request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) );
-		$result     = _wp_privacy_resend_request( $request_id );
+		$request_id = absint(current(array_keys((array) wp_unslash($_POST['privacy_action_email_retry']))));
+		$result     = _wp_privacy_resend_request($request_id);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 			add_settings_error(
 				'privacy_action_email_retry',
 				'privacy_action_email_retry',
@@ -88,51 +88,51 @@ 
 			add_settings_error(
 				'privacy_action_email_retry',
 				'privacy_action_email_retry',
-				__( 'Confirmation request sent again successfully.' ),
+				__('Confirmation request sent again successfully.'),
 				'success'
 			);
 		}
-	} elseif ( isset( $_POST['action'] ) ) {
-		$action = ! empty( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : '';
+	} elseif (isset($_POST['action'])) {
+		$action = !empty($_POST['action']) ? sanitize_key(wp_unslash($_POST['action'])) : '';
 
-		switch ( $action ) {
+		switch ($action) {
 			case 'add_export_personal_data_request':
 			case 'add_remove_personal_data_request':
-				check_admin_referer( 'personal-data-request' );
+				check_admin_referer('personal-data-request');
 
-				if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
+				if (!isset($_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'])) {
 					add_settings_error(
 						'action_type',
 						'action_type',
-						__( 'Invalid personal data action.' ),
+						__('Invalid personal data action.'),
 						'error'
 					);
 				}
-				$action_type               = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
-				$username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
+				$action_type               = sanitize_text_field(wp_unslash($_POST['type_of_action']));
+				$username_or_email_address = sanitize_text_field(wp_unslash($_POST['username_or_email_for_privacy_request']));
 				$email_address             = '';
 				$status                    = 'pending';
 
-				if ( ! isset( $_POST['send_confirmation_email'] ) ) {
+				if (!isset($_POST['send_confirmation_email'])) {
 					$status = 'confirmed';
 				}
 
-				if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
+				if (!in_array($action_type, _wp_privacy_action_request_types(), true)) {
 					add_settings_error(
 						'action_type',
 						'action_type',
-						__( 'Invalid personal data action.' ),
+						__('Invalid personal data action.'),
 						'error'
 					);
 				}
 
-				if ( ! is_email( $username_or_email_address ) ) {
-					$user = get_user_by( 'login', $username_or_email_address );
-					if ( ! $user instanceof WP_User ) {
+				if (!is_email($username_or_email_address)) {
+					$user = get_user_by('login', $username_or_email_address);
+					if (!$user instanceof WP_User) {
 						add_settings_error(
 							'username_or_email_for_privacy_request',
 							'username_or_email_for_privacy_request',
-							__( 'Unable to add this request. A valid email address or username must be supplied.' ),
+							__('Unable to add this request. A valid email address or username must be supplied.'),
 							'error'
 						);
 					} else {
@@ -142,20 +142,20 @@ 
 					$email_address = $username_or_email_address;
 				}
 
-				if ( empty( $email_address ) ) {
+				if (empty($email_address)) {
 					break;
 				}
 
-				$request_id = wp_create_user_request( $email_address, $action_type, array(), $status );
+				$request_id = wp_create_user_request($email_address, $action_type, array(), $status);
 				$message    = '';
 
-				if ( is_wp_error( $request_id ) ) {
+				if (is_wp_error($request_id)) {
 					$message = $request_id->get_error_message();
-				} elseif ( ! $request_id ) {
-					$message = __( 'Unable to initiate confirmation request.' );
+				} elseif (!$request_id) {
+					$message = __('Unable to initiate confirmation request.');
 				}
 
-				if ( $message ) {
+				if ($message) {
 					add_settings_error(
 						'username_or_email_for_privacy_request',
 						'username_or_email_for_privacy_request',
@@ -165,15 +165,15 @@ 
 					break;
 				}
 
-				if ( 'pending' === $status ) {
-					wp_send_user_request( $request_id );
+				if ('pending' === $status) {
+					wp_send_user_request($request_id);
 
-					$message = __( 'Confirmation request initiated successfully.' );
-				} elseif ( 'confirmed' === $status ) {
-					$message = __( 'Request added successfully.' );
+					$message = __('Confirmation request initiated successfully.');
+				} elseif ('confirmed' === $status) {
+					$message = __('Request added successfully.');
 				}
 
-				if ( $message ) {
+				if ($message) {
 					add_settings_error(
 						'username_or_email_for_privacy_request',
 						'username_or_email_for_privacy_request',
@@ -194,7 +194,7 @@ 
  */
 function _wp_personal_data_cleanup_requests() {
 	/** This filter is documented in wp-includes/user.php */
-	$expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
+	$expires = (int) apply_filters('user_request_key_expiration', DAY_IN_SECONDS);
 
 	$requests_query = new WP_Query(
 		array(
@@ -213,7 +213,7 @@ 
 
 	$request_ids = $requests_query->posts;
 
-	foreach ( $request_ids as $request_id ) {
+	foreach ($request_ids as $request_id) {
 		wp_update_post(
 			array(
 				'ID'            => $request_id,
@@ -249,39 +249,39 @@ 
  * @param int    $groups_count The number of all groups
  * @return string The HTML for this group and its items.
  */
-function wp_privacy_generate_personal_data_export_group_html( $group_data, $group_id = '', $groups_count = 1 ) {
-	$group_id_attr = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
+function wp_privacy_generate_personal_data_export_group_html($group_data, $group_id = '', $groups_count = 1) {
+	$group_id_attr = sanitize_title_with_dashes($group_data['group_label'] . '-' . $group_id);
 
-	$group_html  = '<h2 id="' . esc_attr( $group_id_attr ) . '">';
-	$group_html .= esc_html( $group_data['group_label'] );
+	$group_html  = '<h2 id="' . esc_attr($group_id_attr) . '">';
+	$group_html .= esc_html($group_data['group_label']);
 
-	$items_count = count( (array) $group_data['items'] );
-	if ( $items_count > 1 ) {
-		$group_html .= sprintf( ' <span class="count">(%d)</span>', $items_count );
+	$items_count = count((array) $group_data['items']);
+	if ($items_count > 1) {
+		$group_html .= sprintf(' <span class="count">(%d)</span>', $items_count);
 	}
 
 	$group_html .= '</h2>';
 
-	if ( ! empty( $group_data['group_description'] ) ) {
-		$group_html .= '<p>' . esc_html( $group_data['group_description'] ) . '</p>';
+	if (!empty($group_data['group_description'])) {
+		$group_html .= '<p>' . esc_html($group_data['group_description']) . '</p>';
 	}
 
 	$group_html .= '<div>';
 
-	foreach ( (array) $group_data['items'] as $group_item_id => $group_item_data ) {
+	foreach ((array) $group_data['items'] as $group_item_id => $group_item_data) {
 		$group_html .= '<table>';
 		$group_html .= '<tbody>';
 
-		foreach ( (array) $group_item_data as $group_item_datum ) {
+		foreach ((array) $group_item_data as $group_item_datum) {
 			$value = $group_item_datum['value'];
 			// If it looks like a link, make it a link.
-			if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
-				$value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
+			if (false === strpos($value, ' ') && (0 === strpos($value, 'http://') || 0 === strpos($value, 'https://'))) {
+				$value = '<a href="' . esc_url($value) . '">' . esc_html($value) . '</a>';
 			}
 
 			$group_html .= '<tr>';
-			$group_html .= '<th>' . esc_html( $group_item_datum['name'] ) . '</th>';
-			$group_html .= '<td>' . wp_kses( $value, 'personal_data_export' ) . '</td>';
+			$group_html .= '<th>' . esc_html($group_item_datum['name']) . '</th>';
+			$group_html .= '<td>' . wp_kses($value, 'personal_data_export') . '</td>';
 			$group_html .= '</tr>';
 		}
 
@@ -289,9 +289,9 @@ 
 		$group_html .= '</table>';
 	}
 
-	if ( $groups_count > 1 ) {
+	if ($groups_count > 1) {
 		$group_html .= '<div class="return-to-top">';
-		$group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__( 'Go to top' ) . '</a>';
+		$group_html .= '<a href="#top"><span aria-hidden="true">&uarr; </span> ' . esc_html__('Go to top') . '</a>';
 		$group_html .= '</div>';
 	}
 
@@ -307,49 +307,49 @@ 
  *
  * @param int $request_id The export request ID.
  */
-function wp_privacy_generate_personal_data_export_file( $request_id ) {
-	if ( ! class_exists( 'ZipArchive' ) ) {
-		wp_send_json_error( __( 'Unable to generate personal data export file. ZipArchive not available.' ) );
+function wp_privacy_generate_personal_data_export_file($request_id) {
+	if (!class_exists('ZipArchive')) {
+		wp_send_json_error(__('Unable to generate personal data export file. ZipArchive not available.'));
 	}
 
 	// Get the request.
-	$request = wp_get_user_request( $request_id );
+	$request = wp_get_user_request($request_id);
 
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when generating personal data export file.' ) );
+	if (!$request || 'export_personal_data' !== $request->action_name) {
+		wp_send_json_error(__('Invalid request ID when generating personal data export file.'));
 	}
 
 	$email_address = $request->email;
 
-	if ( ! is_email( $email_address ) ) {
-		wp_send_json_error( __( 'Invalid email address when generating personal data export file.' ) );
+	if (!is_email($email_address)) {
+		wp_send_json_error(__('Invalid email address when generating personal data export file.'));
 	}
 
 	// Create the exports folder if needed.
 	$exports_dir = wp_privacy_exports_dir();
 	$exports_url = wp_privacy_exports_url();
 
-	if ( ! wp_mkdir_p( $exports_dir ) ) {
-		wp_send_json_error( __( 'Unable to create personal data export folder.' ) );
+	if (!wp_mkdir_p($exports_dir)) {
+		wp_send_json_error(__('Unable to create personal data export folder.'));
 	}
 
 	// Protect export folder from browsing.
 	$index_pathname = $exports_dir . 'index.php';
-	if ( ! file_exists( $index_pathname ) ) {
-		$file = fopen( $index_pathname, 'w' );
-		if ( false === $file ) {
-			wp_send_json_error( __( 'Unable to protect personal data export folder from browsing.' ) );
+	if (!file_exists($index_pathname)) {
+		$file = fopen($index_pathname, 'w');
+		if (false === $file) {
+			wp_send_json_error(__('Unable to protect personal data export folder from browsing.'));
 		}
-		fwrite( $file, "<?php\n// Silence is golden.\n" );
-		fclose( $file );
+		fwrite($file, "<?php\n// Silence is golden.\n");
+		fclose($file);
 	}
 
-	$obscura              = wp_generate_password( 32, false, false );
+	$obscura              = wp_generate_password(32, false, false);
 	$file_basename        = 'wp-personal-data-file-' . $obscura;
-	$html_report_filename = wp_unique_filename( $exports_dir, $file_basename . '.html' );
-	$html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
+	$html_report_filename = wp_unique_filename($exports_dir, $file_basename . '.html');
+	$html_report_pathname = wp_normalize_path($exports_dir . $html_report_filename);
 	$json_report_filename = $file_basename . '.json';
-	$json_report_pathname = wp_normalize_path( $exports_dir . $json_report_filename );
+	$json_report_pathname = wp_normalize_path($exports_dir . $json_report_filename);
 
 	/*
 	 * Gather general data needed.
@@ -358,50 +358,50 @@ 
 	// Title.
 	$title = sprintf(
 		/* translators: %s: User's email address. */
-		__( 'Personal Data Export for %s' ),
+		__('Personal Data Export for %s'),
 		$email_address
 	);
 
 	// First, build an "About" group on the fly for this report.
 	$about_group = array(
 		/* translators: Header for the About section in a personal data export. */
-		'group_label'       => _x( 'About', 'personal data group label' ),
+		'group_label'       => _x('About', 'personal data group label'),
 		/* translators: Description for the About section in a personal data export. */
-		'group_description' => _x( 'Overview of export report.', 'personal data group description' ),
+		'group_description' => _x('Overview of export report.', 'personal data group description'),
 		'items'             => array(
 			'about-1' => array(
 				array(
-					'name'  => _x( 'Report generated for', 'email address' ),
+					'name'  => _x('Report generated for', 'email address'),
 					'value' => $email_address,
 				),
 				array(
-					'name'  => _x( 'For site', 'website name' ),
-					'value' => get_bloginfo( 'name' ),
+					'name'  => _x('For site', 'website name'),
+					'value' => get_bloginfo('name'),
 				),
 				array(
-					'name'  => _x( 'At URL', 'website URL' ),
-					'value' => get_bloginfo( 'url' ),
+					'name'  => _x('At URL', 'website URL'),
+					'value' => get_bloginfo('url'),
 				),
 				array(
-					'name'  => _x( 'On', 'date/time' ),
-					'value' => current_time( 'mysql' ),
+					'name'  => _x('On', 'date/time'),
+					'value' => current_time('mysql'),
 				),
 			),
 		),
 	);
 
 	// And now, all the Groups.
-	$groups = get_post_meta( $request_id, '_export_data_grouped', true );
-	if ( is_array( $groups ) ) {
+	$groups = get_post_meta($request_id, '_export_data_grouped', true);
+	if (is_array($groups)) {
 		// Merge in the special "About" group.
-		$groups       = array_merge( array( 'about' => $about_group ), $groups );
-		$groups_count = count( $groups );
+		$groups       = array_merge(array('about' => $about_group), $groups);
+		$groups_count = count($groups);
 	} else {
-		if ( false !== $groups ) {
+		if (false !== $groups) {
 			_doing_it_wrong(
 				__FUNCTION__,
 				/* translators: %s: Post meta key. */
-				sprintf( __( 'The %s post meta must be an array.' ), '<code>_export_data_grouped</code>' ),
+				sprintf(__('The %s post meta must be an array.'), '<code>_export_data_grouped</code>'),
 				'5.8.0'
 			);
 		}
@@ -411,89 +411,89 @@ 
 	}
 
 	// Convert the groups to JSON format.
-	$groups_json = wp_json_encode( $groups );
+	$groups_json = wp_json_encode($groups);
 
-	if ( false === $groups_json ) {
+	if (false === $groups_json) {
 		$error_message = sprintf(
 			/* translators: %s: Error message. */
-			__( 'Unable to encode the personal data for export. Error: %s' ),
+			__('Unable to encode the personal data for export. Error: %s'),
 			json_last_error_msg()
 		);
 
-		wp_send_json_error( $error_message );
+		wp_send_json_error($error_message);
 	}
 
 	/*
 	 * Handle the JSON export.
 	 */
-	$file = fopen( $json_report_pathname, 'w' );
+	$file = fopen($json_report_pathname, 'w');
 
-	if ( false === $file ) {
-		wp_send_json_error( __( 'Unable to open personal data export file (JSON report) for writing.' ) );
+	if (false === $file) {
+		wp_send_json_error(__('Unable to open personal data export file (JSON report) for writing.'));
 	}
 
-	fwrite( $file, '{' );
-	fwrite( $file, '"' . $title . '":' );
-	fwrite( $file, $groups_json );
-	fwrite( $file, '}' );
-	fclose( $file );
+	fwrite($file, '{');
+	fwrite($file, '"' . $title . '":');
+	fwrite($file, $groups_json);
+	fwrite($file, '}');
+	fclose($file);
 
 	/*
 	 * Handle the HTML export.
 	 */
-	$file = fopen( $html_report_pathname, 'w' );
-
-	if ( false === $file ) {
-		wp_send_json_error( __( 'Unable to open personal data export (HTML report) for writing.' ) );
-	}
-
-	fwrite( $file, "<!DOCTYPE html>\n" );
-	fwrite( $file, "<html>\n" );
-	fwrite( $file, "<head>\n" );
-	fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
-	fwrite( $file, "<style type='text/css'>" );
-	fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
-	fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
-	fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );
-	fwrite( $file, 'td { padding: 5px; }' );
-	fwrite( $file, 'tr:nth-child(odd) { background-color: #fafafa; }' );
-	fwrite( $file, '.return-to-top { text-align: right; }' );
-	fwrite( $file, '</style>' );
-	fwrite( $file, '<title>' );
-	fwrite( $file, esc_html( $title ) );
-	fwrite( $file, '</title>' );
-	fwrite( $file, "</head>\n" );
-	fwrite( $file, "<body>\n" );
-	fwrite( $file, '<h1 id="top">' . esc_html__( 'Personal Data Export' ) . '</h1>' );
+	$file = fopen($html_report_pathname, 'w');
+
+	if (false === $file) {
+		wp_send_json_error(__('Unable to open personal data export (HTML report) for writing.'));
+	}
+
+	fwrite($file, "<!DOCTYPE html>\n");
+	fwrite($file, "<html>\n");
+	fwrite($file, "<head>\n");
+	fwrite($file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n");
+	fwrite($file, "<style type='text/css'>");
+	fwrite($file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }');
+	fwrite($file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }');
+	fwrite($file, 'th { padding: 5px; text-align: left; width: 20%; }');
+	fwrite($file, 'td { padding: 5px; }');
+	fwrite($file, 'tr:nth-child(odd) { background-color: #fafafa; }');
+	fwrite($file, '.return-to-top { text-align: right; }');
+	fwrite($file, '</style>');
+	fwrite($file, '<title>');
+	fwrite($file, esc_html($title));
+	fwrite($file, '</title>');
+	fwrite($file, "</head>\n");
+	fwrite($file, "<body>\n");
+	fwrite($file, '<h1 id="top">' . esc_html__('Personal Data Export') . '</h1>');
 
 	// Create TOC.
-	if ( $groups_count > 1 ) {
-		fwrite( $file, '<div id="table_of_contents">' );
-		fwrite( $file, '<h2>' . esc_html__( 'Table of Contents' ) . '</h2>' );
-		fwrite( $file, '<ul>' );
-		foreach ( (array) $groups as $group_id => $group_data ) {
-			$group_label       = esc_html( $group_data['group_label'] );
-			$group_id_attr     = sanitize_title_with_dashes( $group_data['group_label'] . '-' . $group_id );
-			$group_items_count = count( (array) $group_data['items'] );
-			if ( $group_items_count > 1 ) {
-				$group_label .= sprintf( ' <span class="count">(%d)</span>', $group_items_count );
+	if ($groups_count > 1) {
+		fwrite($file, '<div id="table_of_contents">');
+		fwrite($file, '<h2>' . esc_html__('Table of Contents') . '</h2>');
+		fwrite($file, '<ul>');
+		foreach ((array) $groups as $group_id => $group_data) {
+			$group_label       = esc_html($group_data['group_label']);
+			$group_id_attr     = sanitize_title_with_dashes($group_data['group_label'] . '-' . $group_id);
+			$group_items_count = count((array) $group_data['items']);
+			if ($group_items_count > 1) {
+				$group_label .= sprintf(' <span class="count">(%d)</span>', $group_items_count);
 			}
-			fwrite( $file, '<li>' );
-			fwrite( $file, '<a href="#' . esc_attr( $group_id_attr ) . '">' . $group_label . '</a>' );
-			fwrite( $file, '</li>' );
+			fwrite($file, '<li>');
+			fwrite($file, '<a href="#' . esc_attr($group_id_attr) . '">' . $group_label . '</a>');
+			fwrite($file, '</li>');
 		}
-		fwrite( $file, '</ul>' );
-		fwrite( $file, '</div>' );
+		fwrite($file, '</ul>');
+		fwrite($file, '</div>');
 	}
 
 	// Now, iterate over every group in $groups and have the formatter render it in HTML.
-	foreach ( (array) $groups as $group_id => $group_data ) {
-		fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data, $group_id, $groups_count ) );
+	foreach ((array) $groups as $group_id => $group_data) {
+		fwrite($file, wp_privacy_generate_personal_data_export_group_html($group_data, $group_id, $groups_count));
 	}
 
-	fwrite( $file, "</body>\n" );
-	fwrite( $file, "</html>\n" );
-	fclose( $file );
+	fwrite($file, "</body>\n");
+	fwrite($file, "</html>\n");
+	fclose($file);
 
 	/*
 	 * Now, generate the ZIP.
@@ -504,50 +504,50 @@ 
 	$error = false;
 
 	// This meta value is used from version 5.5.
-	$archive_filename = get_post_meta( $request_id, '_export_file_name', true );
+	$archive_filename = get_post_meta($request_id, '_export_file_name', true);
 
 	// This one stored an absolute path and is used for backward compatibility.
-	$archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
+	$archive_pathname = get_post_meta($request_id, '_export_file_path', true);
 
 	// If a filename meta exists, use it.
-	if ( ! empty( $archive_filename ) ) {
+	if (!empty($archive_filename)) {
 		$archive_pathname = $exports_dir . $archive_filename;
-	} elseif ( ! empty( $archive_pathname ) ) {
+	} elseif (!empty($archive_pathname)) {
 		// If a full path meta exists, use it and create the new meta value.
-		$archive_filename = basename( $archive_pathname );
+		$archive_filename = basename($archive_pathname);
 
-		update_post_meta( $request_id, '_export_file_name', $archive_filename );
+		update_post_meta($request_id, '_export_file_name', $archive_filename);
 
 		// Remove the back-compat meta values.
-		delete_post_meta( $request_id, '_export_file_url' );
-		delete_post_meta( $request_id, '_export_file_path' );
+		delete_post_meta($request_id, '_export_file_url');
+		delete_post_meta($request_id, '_export_file_path');
 	} else {
 		// If there's no filename or full path stored, create a new file.
 		$archive_filename = $file_basename . '.zip';
 		$archive_pathname = $exports_dir . $archive_filename;
 
-		update_post_meta( $request_id, '_export_file_name', $archive_filename );
+		update_post_meta($request_id, '_export_file_name', $archive_filename);
 	}
 
 	$archive_url = $exports_url . $archive_filename;
 
-	if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
-		wp_delete_file( $archive_pathname );
+	if (!empty($archive_pathname) && file_exists($archive_pathname)) {
+		wp_delete_file($archive_pathname);
 	}
 
 	$zip = new ZipArchive;
-	if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
-		if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
-			$error = __( 'Unable to archive the personal data export file (JSON format).' );
+	if (true === $zip->open($archive_pathname, ZipArchive::CREATE)) {
+		if (!$zip->addFile($json_report_pathname, 'export.json')) {
+			$error = __('Unable to archive the personal data export file (JSON format).');
 		}
 
-		if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
-			$error = __( 'Unable to archive the personal data export file (HTML format).' );
+		if (!$zip->addFile($html_report_pathname, 'index.html')) {
+			$error = __('Unable to archive the personal data export file (HTML format).');
 		}
 
 		$zip->close();
 
-		if ( ! $error ) {
+		if (!$error) {
 			/**
 			 * Fires right after all personal data has been written to the export file.
 			 *
@@ -560,20 +560,20 @@ 
 			 * @param int    $request_id           The export request ID.
 			 * @param string $json_report_pathname The full path to the JSON personal data report on the filesystem.
 			 */
-			do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id, $json_report_pathname );
+			do_action('wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id, $json_report_pathname);
 		}
 	} else {
-		$error = __( 'Unable to open personal data export file (archive) for writing.' );
+		$error = __('Unable to open personal data export file (archive) for writing.');
 	}
 
 	// Remove the JSON file.
-	unlink( $json_report_pathname );
+	unlink($json_report_pathname);
 
 	// Remove the HTML file.
-	unlink( $html_report_pathname );
+	unlink($html_report_pathname);
 
-	if ( $error ) {
-		wp_send_json_error( $error );
+	if ($error) {
+		wp_send_json_error($error);
 	}
 }
 
@@ -585,32 +585,32 @@ 
  * @param int $request_id The request ID for this personal data export.
  * @return true|WP_Error True on success or `WP_Error` on failure.
  */
-function wp_privacy_send_personal_data_export_email( $request_id ) {
+function wp_privacy_send_personal_data_export_email($request_id) {
 	// Get the request.
-	$request = wp_get_user_request( $request_id );
+	$request = wp_get_user_request($request_id);
 
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		return new WP_Error( 'invalid_request', __( 'Invalid request ID when sending personal data export email.' ) );
+	if (!$request || 'export_personal_data' !== $request->action_name) {
+		return new WP_Error('invalid_request', __('Invalid request ID when sending personal data export email.'));
 	}
 
 	// Localize message content for user; fallback to site default for visitors.
-	if ( ! empty( $request->user_id ) ) {
-		$locale = get_user_locale( $request->user_id );
+	if (!empty($request->user_id)) {
+		$locale = get_user_locale($request->user_id);
 	} else {
 		$locale = get_locale();
 	}
 
-	$switched_locale = switch_to_locale( $locale );
+	$switched_locale = switch_to_locale($locale);
 
 	/** This filter is documented in wp-includes/functions.php */
-	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
-	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
+	$expiration      = apply_filters('wp_privacy_export_expiration', 3 * DAY_IN_SECONDS);
+	$expiration_date = date_i18n(get_option('date_format'), time() + $expiration);
 
 	$exports_url      = wp_privacy_exports_url();
-	$export_file_name = get_post_meta( $request_id, '_export_file_name', true );
+	$export_file_name = get_post_meta($request_id, '_export_file_name', true);
 	$export_file_url  = $exports_url . $export_file_name;
 
-	$site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+	$site_name = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 	$site_url  = home_url();
 
 	/**
@@ -622,7 +622,7 @@ 
 	 * @param string          $request_email The email address of the notification recipient.
 	 * @param WP_User_Request $request       The request that is initiating the notification.
 	 */
-	$request_email = apply_filters( 'wp_privacy_personal_data_email_to', $request->email, $request );
+	$request_email = apply_filters('wp_privacy_personal_data_email_to', $request->email, $request);
 
 	$email_data = array(
 		'request'           => $request,
@@ -635,7 +635,7 @@ 
 	);
 
 	/* translators: Personal data export notification email subject. %s: Site title. */
-	$subject = sprintf( __( '[%s] Personal Data Export' ), $site_name );
+	$subject = sprintf(__('[%s] Personal Data Export'), $site_name);
 
 	/**
 	 * Filters the subject of the email sent when an export request is completed.
@@ -658,7 +658,7 @@ 
 	 *     @type string          $siteurl           The site URL sending the mail.
 	 * }
 	 */
-	$subject = apply_filters( 'wp_privacy_personal_data_email_subject', $subject, $site_name, $email_data );
+	$subject = apply_filters('wp_privacy_personal_data_email_subject', $subject, $site_name, $email_data);
 
 	/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
@@ -703,13 +703,13 @@ 
 	 *     @type string          $sitename          The site name sending the mail.
 	 *     @type string          $siteurl           The site URL sending the mail.
 	 */
-	$content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id, $email_data );
+	$content = apply_filters('wp_privacy_personal_data_email_content', $email_text, $request_id, $email_data);
 
-	$content = str_replace( '###EXPIRATION###', $expiration_date, $content );
-	$content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
-	$content = str_replace( '###EMAIL###', $request_email, $content );
-	$content = str_replace( '###SITENAME###', $site_name, $content );
-	$content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
+	$content = str_replace('###EXPIRATION###', $expiration_date, $content);
+	$content = str_replace('###LINK###', esc_url_raw($export_file_url), $content);
+	$content = str_replace('###EMAIL###', $request_email, $content);
+	$content = str_replace('###SITENAME###', $site_name, $content);
+	$content = str_replace('###SITEURL###', esc_url_raw($site_url), $content);
 
 	$headers = '';
 
@@ -736,16 +736,16 @@ 
 	 *     @type string          $siteurl           The site URL sending the mail.
 	 * }
 	 */
-	$headers = apply_filters( 'wp_privacy_personal_data_email_headers', $headers, $subject, $content, $request_id, $email_data );
+	$headers = apply_filters('wp_privacy_personal_data_email_headers', $headers, $subject, $content, $request_id, $email_data);
 
-	$mail_success = wp_mail( $request_email, $subject, $content, $headers );
+	$mail_success = wp_mail($request_email, $subject, $content, $headers);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
-	if ( ! $mail_success ) {
-		return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export email.' ) );
+	if (!$mail_success) {
+		return new WP_Error('privacy_email_error', __('Unable to send personal data export email.'));
 	}
 
 	return true;
@@ -767,57 +767,57 @@ 
  * @param string $exporter_key    The slug (key) of the exporter.
  * @return array The filtered response.
  */
-function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
+function wp_privacy_process_personal_data_export_page($response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key) {
 	/* Do some simple checks on the shape of the response from the exporter.
 	 * If the exporter response is malformed, don't attempt to consume it - let it
 	 * pass through to generate a warning to the user by default Ajax processing.
 	 */
-	if ( ! is_array( $response ) ) {
+	if (!is_array($response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'done', $response ) ) {
+	if (!array_key_exists('done', $response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'data', $response ) ) {
+	if (!array_key_exists('data', $response)) {
 		return $response;
 	}
 
-	if ( ! is_array( $response['data'] ) ) {
+	if (!is_array($response['data'])) {
 		return $response;
 	}
 
 	// Get the request.
-	$request = wp_get_user_request( $request_id );
+	$request = wp_get_user_request($request_id);
 
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when merging personal data to export.' ) );
+	if (!$request || 'export_personal_data' !== $request->action_name) {
+		wp_send_json_error(__('Invalid request ID when merging personal data to export.'));
 	}
 
 	$export_data = array();
 
 	// First exporter, first page? Reset the report data accumulation array.
-	if ( 1 === $exporter_index && 1 === $page ) {
-		update_post_meta( $request_id, '_export_data_raw', $export_data );
+	if (1 === $exporter_index && 1 === $page) {
+		update_post_meta($request_id, '_export_data_raw', $export_data);
 	} else {
-		$accumulated_data = get_post_meta( $request_id, '_export_data_raw', true );
+		$accumulated_data = get_post_meta($request_id, '_export_data_raw', true);
 
-		if ( $accumulated_data ) {
+		if ($accumulated_data) {
 			$export_data = $accumulated_data;
 		}
 	}
 
 	// Now, merge the data from the exporter response into the data we have accumulated already.
-	$export_data = array_merge( $export_data, $response['data'] );
-	update_post_meta( $request_id, '_export_data_raw', $export_data );
+	$export_data = array_merge($export_data, $response['data']);
+	update_post_meta($request_id, '_export_data_raw', $export_data);
 
 	// If we are not yet on the last page of the last exporter, return now.
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$exporters        = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-	$is_last_exporter = count( $exporters ) === $exporter_index;
+	$exporters        = apply_filters('wp_privacy_personal_data_exporters', array());
+	$is_last_exporter = count($exporters) === $exporter_index;
 	$exporter_done    = $response['done'];
-	if ( ! $is_last_exporter || ! $exporter_done ) {
+	if (!$is_last_exporter || !$exporter_done) {
 		return $response;
 	}
 
@@ -825,17 +825,17 @@ 
 
 	// First we need to re-organize the raw data hierarchically in groups and items.
 	$groups = array();
-	foreach ( (array) $export_data as $export_datum ) {
+	foreach ((array) $export_data as $export_datum) {
 		$group_id    = $export_datum['group_id'];
 		$group_label = $export_datum['group_label'];
 
 		$group_description = '';
-		if ( ! empty( $export_datum['group_description'] ) ) {
+		if (!empty($export_datum['group_description'])) {
 			$group_description = $export_datum['group_description'];
 		}
 
-		if ( ! array_key_exists( $group_id, $groups ) ) {
-			$groups[ $group_id ] = array(
+		if (!array_key_exists($group_id, $groups)) {
+			$groups[$group_id] = array(
 				'group_label'       => $group_label,
 				'group_description' => $group_description,
 				'items'             => array(),
@@ -843,18 +843,18 @@ 
 		}
 
 		$item_id = $export_datum['item_id'];
-		if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) {
-			$groups[ $group_id ]['items'][ $item_id ] = array();
+		if (!array_key_exists($item_id, $groups[$group_id]['items'])) {
+			$groups[$group_id]['items'][$item_id] = array();
 		}
 
-		$old_item_data                            = $groups[ $group_id ]['items'][ $item_id ];
-		$merged_item_data                         = array_merge( $export_datum['data'], $old_item_data );
-		$groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
+		$old_item_data                            = $groups[$group_id]['items'][$item_id];
+		$merged_item_data                         = array_merge($export_datum['data'], $old_item_data);
+		$groups[$group_id]['items'][$item_id] = $merged_item_data;
 	}
 
 	// Then save the grouped data into the request.
-	delete_post_meta( $request_id, '_export_data_raw' );
-	update_post_meta( $request_id, '_export_data_grouped', $groups );
+	delete_post_meta($request_id, '_export_data_raw');
+	update_post_meta($request_id, '_export_data_grouped', $groups);
 
 	/**
 	 * Generate the export file from the collected, grouped personal data.
@@ -863,27 +863,27 @@ 
 	 *
 	 * @param int $request_id The export request ID.
 	 */
-	do_action( 'wp_privacy_personal_data_export_file', $request_id );
+	do_action('wp_privacy_personal_data_export_file', $request_id);
 
 	// Clear the grouped data now that it is no longer needed.
-	delete_post_meta( $request_id, '_export_data_grouped' );
+	delete_post_meta($request_id, '_export_data_grouped');
 
 	// If the destination is email, send it now.
-	if ( $send_as_email ) {
-		$mail_success = wp_privacy_send_personal_data_export_email( $request_id );
-		if ( is_wp_error( $mail_success ) ) {
-			wp_send_json_error( $mail_success->get_error_message() );
+	if ($send_as_email) {
+		$mail_success = wp_privacy_send_personal_data_export_email($request_id);
+		if (is_wp_error($mail_success)) {
+			wp_send_json_error($mail_success->get_error_message());
 		}
 
 		// Update the request to completed state when the export email is sent.
-		_wp_privacy_completed_request( $request_id );
+		_wp_privacy_completed_request($request_id);
 	} else {
 		// Modify the response to include the URL of the export file so the browser can fetch it.
 		$exports_url      = wp_privacy_exports_url();
-		$export_file_name = get_post_meta( $request_id, '_export_file_name', true );
+		$export_file_name = get_post_meta($request_id, '_export_file_name', true);
 		$export_file_url  = $exports_url . $export_file_name;
 
-		if ( ! empty( $export_file_url ) ) {
+		if (!empty($export_file_url)) {
 			$response['url'] = $export_file_url;
 		}
 	}
@@ -913,49 +913,49 @@ 
  * @param int    $request_id    The request ID for this personal data erasure.
  * @return array The filtered response.
  */
-function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index, $email_address, $page, $request_id ) {
+function wp_privacy_process_personal_data_erasure_page($response, $eraser_index, $email_address, $page, $request_id) {
 	/*
 	 * If the eraser response is malformed, don't attempt to consume it; let it
 	 * pass through, so that the default Ajax processing will generate a warning
 	 * to the user.
 	 */
-	if ( ! is_array( $response ) ) {
+	if (!is_array($response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'done', $response ) ) {
+	if (!array_key_exists('done', $response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'items_removed', $response ) ) {
+	if (!array_key_exists('items_removed', $response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'items_retained', $response ) ) {
+	if (!array_key_exists('items_retained', $response)) {
 		return $response;
 	}
 
-	if ( ! array_key_exists( 'messages', $response ) ) {
+	if (!array_key_exists('messages', $response)) {
 		return $response;
 	}
 
 	// Get the request.
-	$request = wp_get_user_request( $request_id );
+	$request = wp_get_user_request($request_id);
 
-	if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when processing personal data to erase.' ) );
+	if (!$request || 'remove_personal_data' !== $request->action_name) {
+		wp_send_json_error(__('Invalid request ID when processing personal data to erase.'));
 	}
 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$erasers        = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-	$is_last_eraser = count( $erasers ) === $eraser_index;
+	$erasers        = apply_filters('wp_privacy_personal_data_erasers', array());
+	$is_last_eraser = count($erasers) === $eraser_index;
 	$eraser_done    = $response['done'];
 
-	if ( ! $is_last_eraser || ! $eraser_done ) {
+	if (!$is_last_eraser || !$eraser_done) {
 		return $response;
 	}
 
-	_wp_privacy_completed_request( $request_id );
+	_wp_privacy_completed_request($request_id);
 
 	/**
 	 * Fires immediately after a personal data erasure request has been marked completed.
@@ -964,7 +964,7 @@ 
 	 *
 	 * @param int $request_id The privacy request post ID associated with this request.
 	 */
-	do_action( 'wp_privacy_personal_data_erased', $request_id );
+	do_action('wp_privacy_personal_data_erased', $request_id);
 
 	return $response;
 }

brighty/wp-admin/includes/user.php

Indentation +463 added lines, -463 removed lines

@@ -14,7 +14,7 @@ 
  * @return int|WP_Error WP_Error or User ID.
  */
 function add_user() {
-	return edit_user();
+    return edit_user();
 }
 
 /**
@@ -28,219 +28,219 @@ 
  * @return int|WP_Error User ID of the updated user or WP_Error on failure.
  */
 function edit_user( $user_id = 0 ) {
-	$wp_roles = wp_roles();
-	$user     = new stdClass;
-	$user_id  = (int) $user_id;
-	if ( $user_id ) {
-		$update           = true;
-		$user->ID         = $user_id;
-		$userdata         = get_userdata( $user_id );
-		$user->user_login = wp_slash( $userdata->user_login );
-	} else {
-		$update = false;
-	}
-
-	if ( ! $update && isset( $_POST['user_login'] ) ) {
-		$user->user_login = sanitize_user( wp_unslash( $_POST['user_login'] ), true );
-	}
-
-	$pass1 = '';
-	$pass2 = '';
-	if ( isset( $_POST['pass1'] ) ) {
-		$pass1 = trim( $_POST['pass1'] );
-	}
-	if ( isset( $_POST['pass2'] ) ) {
-		$pass2 = trim( $_POST['pass2'] );
-	}
-
-	if ( isset( $_POST['role'] ) && current_user_can( 'promote_users' ) && ( ! $user_id || current_user_can( 'promote_user', $user_id ) ) ) {
-		$new_role = sanitize_text_field( $_POST['role'] );
-
-		// If the new role isn't editable by the logged-in user die with error.
-		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[ $new_role ] ) ) {
-			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
-		}
-
-		$potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
-
-		/*
+    $wp_roles = wp_roles();
+    $user     = new stdClass;
+    $user_id  = (int) $user_id;
+    if ( $user_id ) {
+        $update           = true;
+        $user->ID         = $user_id;
+        $userdata         = get_userdata( $user_id );
+        $user->user_login = wp_slash( $userdata->user_login );
+    } else {
+        $update = false;
+    }
+
+    if ( ! $update && isset( $_POST['user_login'] ) ) {
+        $user->user_login = sanitize_user( wp_unslash( $_POST['user_login'] ), true );
+    }
+
+    $pass1 = '';
+    $pass2 = '';
+    if ( isset( $_POST['pass1'] ) ) {
+        $pass1 = trim( $_POST['pass1'] );
+    }
+    if ( isset( $_POST['pass2'] ) ) {
+        $pass2 = trim( $_POST['pass2'] );
+    }
+
+    if ( isset( $_POST['role'] ) && current_user_can( 'promote_users' ) && ( ! $user_id || current_user_can( 'promote_user', $user_id ) ) ) {
+        $new_role = sanitize_text_field( $_POST['role'] );
+
+        // If the new role isn't editable by the logged-in user die with error.
+        $editable_roles = get_editable_roles();
+        if ( ! empty( $new_role ) && empty( $editable_roles[ $new_role ] ) ) {
+            wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
+        }
+
+        $potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
+
+        /*
 		 * Don't let anyone with 'promote_users' edit their own role to something without it.
 		 * Multisite super admins can freely edit their roles, they possess all caps.
 		 */
-		if (
-			( is_multisite() && current_user_can( 'manage_network_users' ) ) ||
-			get_current_user_id() !== $user_id ||
-			( $potential_role && $potential_role->has_cap( 'promote_users' ) )
-		) {
-			$user->role = $new_role;
-		}
-	}
-
-	if ( isset( $_POST['email'] ) ) {
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
-	}
-	if ( isset( $_POST['url'] ) ) {
-		if ( empty( $_POST['url'] ) || 'http://' === $_POST['url'] ) {
-			$user->user_url = '';
-		} else {
-			$user->user_url = esc_url_raw( $_POST['url'] );
-			$protocols      = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
-			$user->user_url = preg_match( '/^(' . $protocols . '):/is', $user->user_url ) ? $user->user_url : 'http://' . $user->user_url;
-		}
-	}
-	if ( isset( $_POST['first_name'] ) ) {
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	}
-	if ( isset( $_POST['last_name'] ) ) {
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	}
-	if ( isset( $_POST['nickname'] ) ) {
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	}
-	if ( isset( $_POST['display_name'] ) ) {
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
-	}
-
-	if ( isset( $_POST['description'] ) ) {
-		$user->description = trim( $_POST['description'] );
-	}
-
-	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[ $method ] ) ) {
-			$user->$method = sanitize_text_field( $_POST[ $method ] );
-		}
-	}
-
-	if ( isset( $_POST['locale'] ) ) {
-		$locale = sanitize_text_field( $_POST['locale'] );
-		if ( 'site-default' === $locale ) {
-			$locale = '';
-		} elseif ( '' === $locale ) {
-			$locale = 'en_US';
-		} elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
-			$locale = '';
-		}
-
-		$user->locale = $locale;
-	}
-
-	if ( $update ) {
-		$user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
-		$user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
-		$user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
-		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
-	}
-
-	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' === $_POST['comment_shortcuts'] ? 'true' : '';
-
-	$user->use_ssl = 0;
-	if ( ! empty( $_POST['use_ssl'] ) ) {
-		$user->use_ssl = 1;
-	}
-
-	$errors = new WP_Error();
-
-	/* checking that username has been typed */
-	if ( '' === $user->user_login ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
-	}
-
-	/* checking that nickname has been typed */
-	if ( $update && empty( $user->nickname ) ) {
-		$errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
-	}
-
-	/**
-	 * Fires before the password and confirm password fields are checked for congruity.
-	 *
-	 * @since 1.5.1
-	 *
-	 * @param string $user_login The username.
-	 * @param string $pass1     The password (passed by reference).
-	 * @param string $pass2     The confirmed password (passed by reference).
-	 */
-	do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
-
-	// Check for blank password when adding a user.
-	if ( ! $update && empty( $pass1 ) ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
-	}
-
-	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
-	}
-
-	// Checking the password has been typed twice the same.
-	if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
-	}
-
-	if ( ! empty( $pass1 ) ) {
-		$user->user_pass = $pass1;
-	}
-
-	if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
-	}
-
-	if ( ! $update && username_exists( $user->user_login ) ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
-	}
-
-	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-
-	if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
-	}
-
-	/* checking email address */
-	if ( empty( $user->user_email ) ) {
-		$errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
-	} elseif ( ! is_email( $user->user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ), array( 'form-field' => 'email' ) );
-	} else {
-		$owner_id = email_exists( $user->user_email );
-		if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
-			$errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
-		}
-	}
-
-	/**
-	 * Fires before user profile update errors are returned.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param WP_Error $errors WP_Error object (passed by reference).
-	 * @param bool     $update Whether this is a user update.
-	 * @param stdClass $user   User object (passed by reference).
-	 */
-	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
-
-	if ( $errors->has_errors() ) {
-		return $errors;
-	}
-
-	if ( $update ) {
-		$user_id = wp_update_user( $user );
-	} else {
-		$user_id = wp_insert_user( $user );
-		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
-
-		/**
-		 * Fires after a new user has been created.
-		 *
-		 * @since 4.4.0
-		 *
-		 * @param int|WP_Error $user_id ID of the newly created user or WP_Error on failure.
-		 * @param string       $notify  Type of notification that should happen. See
-		 *                              wp_send_new_user_notifications() for more information.
-		 */
-		do_action( 'edit_user_created_user', $user_id, $notify );
-	}
-	return $user_id;
+        if (
+            ( is_multisite() && current_user_can( 'manage_network_users' ) ) ||
+            get_current_user_id() !== $user_id ||
+            ( $potential_role && $potential_role->has_cap( 'promote_users' ) )
+        ) {
+            $user->role = $new_role;
+        }
+    }
+
+    if ( isset( $_POST['email'] ) ) {
+        $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+    }
+    if ( isset( $_POST['url'] ) ) {
+        if ( empty( $_POST['url'] ) || 'http://' === $_POST['url'] ) {
+            $user->user_url = '';
+        } else {
+            $user->user_url = esc_url_raw( $_POST['url'] );
+            $protocols      = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
+            $user->user_url = preg_match( '/^(' . $protocols . '):/is', $user->user_url ) ? $user->user_url : 'http://' . $user->user_url;
+        }
+    }
+    if ( isset( $_POST['first_name'] ) ) {
+        $user->first_name = sanitize_text_field( $_POST['first_name'] );
+    }
+    if ( isset( $_POST['last_name'] ) ) {
+        $user->last_name = sanitize_text_field( $_POST['last_name'] );
+    }
+    if ( isset( $_POST['nickname'] ) ) {
+        $user->nickname = sanitize_text_field( $_POST['nickname'] );
+    }
+    if ( isset( $_POST['display_name'] ) ) {
+        $user->display_name = sanitize_text_field( $_POST['display_name'] );
+    }
+
+    if ( isset( $_POST['description'] ) ) {
+        $user->description = trim( $_POST['description'] );
+    }
+
+    foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
+        if ( isset( $_POST[ $method ] ) ) {
+            $user->$method = sanitize_text_field( $_POST[ $method ] );
+        }
+    }
+
+    if ( isset( $_POST['locale'] ) ) {
+        $locale = sanitize_text_field( $_POST['locale'] );
+        if ( 'site-default' === $locale ) {
+            $locale = '';
+        } elseif ( '' === $locale ) {
+            $locale = 'en_US';
+        } elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+            $locale = '';
+        }
+
+        $user->locale = $locale;
+    }
+
+    if ( $update ) {
+        $user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
+        $user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
+        $user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
+        $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+    }
+
+    $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' === $_POST['comment_shortcuts'] ? 'true' : '';
+
+    $user->use_ssl = 0;
+    if ( ! empty( $_POST['use_ssl'] ) ) {
+        $user->use_ssl = 1;
+    }
+
+    $errors = new WP_Error();
+
+    /* checking that username has been typed */
+    if ( '' === $user->user_login ) {
+        $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
+    }
+
+    /* checking that nickname has been typed */
+    if ( $update && empty( $user->nickname ) ) {
+        $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
+    }
+
+    /**
+     * Fires before the password and confirm password fields are checked for congruity.
+     *
+     * @since 1.5.1
+     *
+     * @param string $user_login The username.
+     * @param string $pass1     The password (passed by reference).
+     * @param string $pass2     The confirmed password (passed by reference).
+     */
+    do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
+
+    // Check for blank password when adding a user.
+    if ( ! $update && empty( $pass1 ) ) {
+        $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+    }
+
+    // Check for "\" in password.
+    if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
+        $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
+    }
+
+    // Checking the password has been typed twice the same.
+    if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
+        $errors->add( 'pass', __( '<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+    }
+
+    if ( ! empty( $pass1 ) ) {
+        $user->user_pass = $pass1;
+    }
+
+    if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
+        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+    }
+
+    if ( ! $update && username_exists( $user->user_login ) ) {
+        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
+    }
+
+    /** This filter is documented in wp-includes/user.php */
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+
+    if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
+    }
+
+    /* checking email address */
+    if ( empty( $user->user_email ) ) {
+        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
+    } elseif ( ! is_email( $user->user_email ) ) {
+        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ), array( 'form-field' => 'email' ) );
+    } else {
+        $owner_id = email_exists( $user->user_email );
+        if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
+            $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
+        }
+    }
+
+    /**
+     * Fires before user profile update errors are returned.
+     *
+     * @since 2.8.0
+     *
+     * @param WP_Error $errors WP_Error object (passed by reference).
+     * @param bool     $update Whether this is a user update.
+     * @param stdClass $user   User object (passed by reference).
+     */
+    do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
+
+    if ( $errors->has_errors() ) {
+        return $errors;
+    }
+
+    if ( $update ) {
+        $user_id = wp_update_user( $user );
+    } else {
+        $user_id = wp_insert_user( $user );
+        $notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
+
+        /**
+         * Fires after a new user has been created.
+         *
+         * @since 4.4.0
+         *
+         * @param int|WP_Error $user_id ID of the newly created user or WP_Error on failure.
+         * @param string       $notify  Type of notification that should happen. See
+         *                              wp_send_new_user_notifications() for more information.
+         */
+        do_action( 'edit_user_created_user', $user_id, $notify );
+    }
+    return $user_id;
 }
 
 /**
@@ -260,18 +260,18 @@ 
  * @return array[] Array of arrays containing role information.
  */
 function get_editable_roles() {
-	$all_roles = wp_roles()->roles;
-
-	/**
-	 * Filters the list of editable roles.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param array[] $all_roles Array of arrays containing role information.
-	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
-
-	return $editable_roles;
+    $all_roles = wp_roles()->roles;
+
+    /**
+     * Filters the list of editable roles.
+     *
+     * @since 2.8.0
+     *
+     * @param array[] $all_roles Array of arrays containing role information.
+     */
+    $editable_roles = apply_filters( 'editable_roles', $all_roles );
+
+    return $editable_roles;
 }
 
 /**
@@ -283,13 +283,13 @@ 
  * @return WP_User|false WP_User object on success, false on failure.
  */
 function get_user_to_edit( $user_id ) {
-	$user = get_userdata( $user_id );
+    $user = get_userdata( $user_id );
 
-	if ( $user ) {
-		$user->filter = 'edit';
-	}
+    if ( $user ) {
+        $user->filter = 'edit';
+    }
 
-	return $user;
+    return $user;
 }
 
 /**
@@ -303,18 +303,18 @@ 
  * @return array
  */
 function get_users_drafts( $user_id ) {
-	global $wpdb;
-	$query = $wpdb->prepare( "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id );
-
-	/**
-	 * Filters the user's drafts query string.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param string $query The user's drafts query string.
-	 */
-	$query = apply_filters( 'get_users_drafts', $query );
-	return $wpdb->get_results( $query );
+    global $wpdb;
+    $query = $wpdb->prepare( "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id );
+
+    /**
+     * Filters the user's drafts query string.
+     *
+     * @since 2.0.0
+     *
+     * @param string $query The user's drafts query string.
+     */
+    $query = apply_filters( 'get_users_drafts', $query );
+    return $wpdb->get_results( $query );
 }
 
 /**
@@ -334,119 +334,119 @@ 
  * @return bool True when finished.
  */
 function wp_delete_user( $id, $reassign = null ) {
-	global $wpdb;
-
-	if ( ! is_numeric( $id ) ) {
-		return false;
-	}
-
-	$id   = (int) $id;
-	$user = new WP_User( $id );
-
-	if ( ! $user->exists() ) {
-		return false;
-	}
-
-	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
-	if ( 'novalue' === $reassign ) {
-		$reassign = null;
-	} elseif ( null !== $reassign ) {
-		$reassign = (int) $reassign;
-	}
-
-	/**
-	 * Fires immediately before a user is deleted from the database.
-	 *
-	 * @since 2.0.0
-	 * @since 5.5.0 Added the `$user` parameter.
-	 *
-	 * @param int      $id       ID of the user to delete.
-	 * @param int|null $reassign ID of the user to reassign posts and links to.
-	 *                           Default null, for no reassignment.
-	 * @param WP_User  $user     WP_User object of the user to delete.
-	 */
-	do_action( 'delete_user', $id, $reassign, $user );
-
-	if ( null === $reassign ) {
-		$post_types_to_delete = array();
-		foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
-			if ( $post_type->delete_with_user ) {
-				$post_types_to_delete[] = $post_type->name;
-			} elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
-				$post_types_to_delete[] = $post_type->name;
-			}
-		}
-
-		/**
-		 * Filters the list of post types to delete with a user.
-		 *
-		 * @since 3.4.0
-		 *
-		 * @param string[] $post_types_to_delete Array of post types to delete.
-		 * @param int      $id                   User ID.
-		 */
-		$post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
-		$post_types_to_delete = implode( "', '", $post_types_to_delete );
-		$post_ids             = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
-		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id ) {
-				wp_delete_post( $post_id );
-			}
-		}
-
-		// Clean links.
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
-
-		if ( $link_ids ) {
-			foreach ( $link_ids as $link_id ) {
-				wp_delete_link( $link_id );
-			}
-		}
-	} else {
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-		$wpdb->update( $wpdb->posts, array( 'post_author' => $reassign ), array( 'post_author' => $id ) );
-		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id ) {
-				clean_post_cache( $post_id );
-			}
-		}
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
-		$wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
-		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id ) {
-				clean_bookmark_cache( $link_id );
-			}
-		}
-	}
-
-	// FINALLY, delete user.
-	if ( is_multisite() ) {
-		remove_user_from_blog( $id, get_current_blog_id() );
-	} else {
-		$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-		foreach ( $meta as $mid ) {
-			delete_metadata_by_mid( 'user', $mid );
-		}
-
-		$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
-	}
-
-	clean_user_cache( $user );
-
-	/**
-	 * Fires immediately after a user is deleted from the database.
-	 *
-	 * @since 2.9.0
-	 * @since 5.5.0 Added the `$user` parameter.
-	 *
-	 * @param int      $id       ID of the deleted user.
-	 * @param int|null $reassign ID of the user to reassign posts and links to.
-	 *                           Default null, for no reassignment.
-	 * @param WP_User  $user     WP_User object of the deleted user.
-	 */
-	do_action( 'deleted_user', $id, $reassign, $user );
-
-	return true;
+    global $wpdb;
+
+    if ( ! is_numeric( $id ) ) {
+        return false;
+    }
+
+    $id   = (int) $id;
+    $user = new WP_User( $id );
+
+    if ( ! $user->exists() ) {
+        return false;
+    }
+
+    // Normalize $reassign to null or a user ID. 'novalue' was an older default.
+    if ( 'novalue' === $reassign ) {
+        $reassign = null;
+    } elseif ( null !== $reassign ) {
+        $reassign = (int) $reassign;
+    }
+
+    /**
+     * Fires immediately before a user is deleted from the database.
+     *
+     * @since 2.0.0
+     * @since 5.5.0 Added the `$user` parameter.
+     *
+     * @param int      $id       ID of the user to delete.
+     * @param int|null $reassign ID of the user to reassign posts and links to.
+     *                           Default null, for no reassignment.
+     * @param WP_User  $user     WP_User object of the user to delete.
+     */
+    do_action( 'delete_user', $id, $reassign, $user );
+
+    if ( null === $reassign ) {
+        $post_types_to_delete = array();
+        foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
+            if ( $post_type->delete_with_user ) {
+                $post_types_to_delete[] = $post_type->name;
+            } elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+                $post_types_to_delete[] = $post_type->name;
+            }
+        }
+
+        /**
+         * Filters the list of post types to delete with a user.
+         *
+         * @since 3.4.0
+         *
+         * @param string[] $post_types_to_delete Array of post types to delete.
+         * @param int      $id                   User ID.
+         */
+        $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
+        $post_types_to_delete = implode( "', '", $post_types_to_delete );
+        $post_ids             = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
+        if ( $post_ids ) {
+            foreach ( $post_ids as $post_id ) {
+                wp_delete_post( $post_id );
+            }
+        }
+
+        // Clean links.
+        $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+
+        if ( $link_ids ) {
+            foreach ( $link_ids as $link_id ) {
+                wp_delete_link( $link_id );
+            }
+        }
+    } else {
+        $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
+        $wpdb->update( $wpdb->posts, array( 'post_author' => $reassign ), array( 'post_author' => $id ) );
+        if ( ! empty( $post_ids ) ) {
+            foreach ( $post_ids as $post_id ) {
+                clean_post_cache( $post_id );
+            }
+        }
+        $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+        $wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
+        if ( ! empty( $link_ids ) ) {
+            foreach ( $link_ids as $link_id ) {
+                clean_bookmark_cache( $link_id );
+            }
+        }
+    }
+
+    // FINALLY, delete user.
+    if ( is_multisite() ) {
+        remove_user_from_blog( $id, get_current_blog_id() );
+    } else {
+        $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+        foreach ( $meta as $mid ) {
+            delete_metadata_by_mid( 'user', $mid );
+        }
+
+        $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+    }
+
+    clean_user_cache( $user );
+
+    /**
+     * Fires immediately after a user is deleted from the database.
+     *
+     * @since 2.9.0
+     * @since 5.5.0 Added the `$user` parameter.
+     *
+     * @param int      $id       ID of the deleted user.
+     * @param int|null $reassign ID of the user to reassign posts and links to.
+     *                           Default null, for no reassignment.
+     * @param WP_User  $user     WP_User object of the deleted user.
+     */
+    do_action( 'deleted_user', $id, $reassign, $user );
+
+    return true;
 }
 
 /**
@@ -457,10 +457,10 @@ 
  * @param int $id User ID.
  */
 function wp_revoke_user( $id ) {
-	$id = (int) $id;
+    $id = (int) $id;
 
-	$user = new WP_User( $id );
-	$user->remove_all_caps();
+    $user = new WP_User( $id );
+    $user->remove_all_caps();
 }
 
 /**
@@ -471,19 +471,19 @@ 
  * @param false $errors Deprecated.
  */
 function default_password_nag_handler( $errors = false ) {
-	global $user_ID;
-	// Short-circuit it.
-	if ( ! get_user_option( 'default_password_nag' ) ) {
-		return;
-	}
-
-	// get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
-	if ( 'hide' === get_user_setting( 'default_password_nag' )
-		|| isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag']
-	) {
-		delete_user_setting( 'default_password_nag' );
-		update_user_meta( $user_ID, 'default_password_nag', false );
-	}
+    global $user_ID;
+    // Short-circuit it.
+    if ( ! get_user_option( 'default_password_nag' ) ) {
+        return;
+    }
+
+    // get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
+    if ( 'hide' === get_user_setting( 'default_password_nag' )
+        || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag']
+    ) {
+        delete_user_setting( 'default_password_nag' );
+        update_user_meta( $user_ID, 'default_password_nag', false );
+    }
 }
 
 /**
@@ -493,18 +493,18 @@ 
  * @param WP_User $old_data
  */
 function default_password_nag_edit_user( $user_ID, $old_data ) {
-	// Short-circuit it.
-	if ( ! get_user_option( 'default_password_nag', $user_ID ) ) {
-		return;
-	}
-
-	$new_data = get_userdata( $user_ID );
-
-	// Remove the nag if the password has been changed.
-	if ( $new_data->user_pass != $old_data->user_pass ) {
-		delete_user_setting( 'default_password_nag' );
-		update_user_meta( $user_ID, 'default_password_nag', false );
-	}
+    // Short-circuit it.
+    if ( ! get_user_option( 'default_password_nag', $user_ID ) ) {
+        return;
+    }
+
+    $new_data = get_userdata( $user_ID );
+
+    // Remove the nag if the password has been changed.
+    if ( $new_data->user_pass != $old_data->user_pass ) {
+        delete_user_setting( 'default_password_nag' );
+        update_user_meta( $user_ID, 'default_password_nag', false );
+    }
 }
 
 /**
@@ -513,21 +513,21 @@ 
  * @global string $pagenow The filename of the current screen.
  */
 function default_password_nag() {
-	global $pagenow;
-
-	// Short-circuit it.
-	if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
-		return;
-	}
-
-	echo '<div class="error default-password-nag">';
-	echo '<p>';
-	echo '<strong>' . __( 'Notice:' ) . '</strong> ';
-	_e( 'You&rsquo;re using the auto-generated password for your account. Would you like to change it?' );
-	echo '</p><p>';
-	printf( '<a href="%s">' . __( 'Yes, take me to my profile page' ) . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __( 'No thanks, do not remind me again' ) . '</a>', '?default_password_nag=0' );
-	echo '</p></div>';
+    global $pagenow;
+
+    // Short-circuit it.
+    if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
+        return;
+    }
+
+    echo '<div class="error default-password-nag">';
+    echo '<p>';
+    echo '<strong>' . __( 'Notice:' ) . '</strong> ';
+    _e( 'You&rsquo;re using the auto-generated password for your account. Would you like to change it?' );
+    echo '</p><p>';
+    printf( '<a href="%s">' . __( 'Yes, take me to my profile page' ) . '</a> | ', get_edit_profile_url() . '#password' );
+    printf( '<a href="%s" id="default-password-nag-no">' . __( 'No thanks, do not remind me again' ) . '</a>', '?default_password_nag=0' );
+    echo '</p></div>';
 }
 
 /**
@@ -535,7 +535,7 @@ 
  * @access private
  */
 function delete_users_add_js() {
-	?>
+    ?>
 <script>
 jQuery( function($) {
 	var submit = $('#submit').prop('disabled', true);
@@ -560,7 +560,7 @@ 
  * @param WP_User $user User data object.
  */
 function use_ssl_preference( $user ) {
-	?>
+    ?>
 	<tr class="user-use-ssl-wrap">
 		<th scope="row"><?php _e( 'Use https' ); ?></th>
 		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked( '1', $user->use_ssl ); ?> /> <?php _e( 'Always use https when visiting the admin' ); ?></label></td>
@@ -575,19 +575,19 @@ 
  * @return string
  */
 function admin_created_user_email( $text ) {
-	$roles = get_editable_roles();
-	$role  = $roles[ $_REQUEST['role'] ];
-
-	if ( '' !== get_bloginfo( 'name' ) ) {
-		$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
-	} else {
-		$site_title = parse_url( home_url(), PHP_URL_HOST );
-	}
-
-	return sprintf(
-		/* translators: 1: Site title, 2: Site URL, 3: User role. */
-		__(
-			'Hi,
+    $roles = get_editable_roles();
+    $role  = $roles[ $_REQUEST['role'] ];
+
+    if ( '' !== get_bloginfo( 'name' ) ) {
+        $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+    } else {
+        $site_title = parse_url( home_url(), PHP_URL_HOST );
+    }
+
+    return sprintf(
+        /* translators: 1: Site title, 2: Site URL, 3: User role. */
+        __(
+            'Hi,
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 If you do not want to join this site please ignore
@@ -595,11 +595,11 @@ 
 
 Please click the following link to activate your user account:
 %%s'
-		),
-		$site_title,
-		home_url(),
-		wp_specialchars_decode( translate_user_role( $role['name'] ) )
-	);
+        ),
+        $site_title,
+        home_url(),
+        wp_specialchars_decode( translate_user_role( $role['name'] ) )
+    );
 }
 
 /**
@@ -619,51 +619,51 @@ 
  * @return true|WP_Error True if the request is valid, a WP_Error object contains errors if not.
  */
 function wp_is_authorize_application_password_request_valid( $request, $user ) {
-	$error = new WP_Error();
-
-	if ( ! empty( $request['success_url'] ) ) {
-		$scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
-
-		if ( 'http' === $scheme ) {
-			$error->add(
-				'invalid_redirect_scheme',
-				__( 'The success URL must be served over a secure connection.' )
-			);
-		}
-	}
-
-	if ( ! empty( $request['reject_url'] ) ) {
-		$scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
-
-		if ( 'http' === $scheme ) {
-			$error->add(
-				'invalid_redirect_scheme',
-				__( 'The rejection URL must be served over a secure connection.' )
-			);
-		}
-	}
-
-	if ( ! empty( $request['app_id'] ) && ! wp_is_uuid( $request['app_id'] ) ) {
-		$error->add(
-			'invalid_app_id',
-			__( 'The application ID must be a UUID.' )
-		);
-	}
-
-	/**
-	 * Fires before application password errors are returned.
-	 *
-	 * @since 5.6.0
-	 *
-	 * @param WP_Error $error   The error object.
-	 * @param array    $request The array of request data.
-	 * @param WP_User  $user    The user authorizing the application.
-	 */
-	do_action( 'wp_authorize_application_password_request_errors', $error, $request, $user );
-
-	if ( $error->has_errors() ) {
-		return $error;
-	}
-
-	return true;
+    $error = new WP_Error();
+
+    if ( ! empty( $request['success_url'] ) ) {
+        $scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
+
+        if ( 'http' === $scheme ) {
+            $error->add(
+                'invalid_redirect_scheme',
+                __( 'The success URL must be served over a secure connection.' )
+            );
+        }
+    }
+
+    if ( ! empty( $request['reject_url'] ) ) {
+        $scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
+
+        if ( 'http' === $scheme ) {
+            $error->add(
+                'invalid_redirect_scheme',
+                __( 'The rejection URL must be served over a secure connection.' )
+            );
+        }
+    }
+
+    if ( ! empty( $request['app_id'] ) && ! wp_is_uuid( $request['app_id'] ) ) {
+        $error->add(
+            'invalid_app_id',
+            __( 'The application ID must be a UUID.' )
+        );
+    }
+
+    /**
+     * Fires before application password errors are returned.
+     *
+     * @since 5.6.0
+     *
+     * @param WP_Error $error   The error object.
+     * @param array    $request The array of request data.
+     * @param WP_User  $user    The user authorizing the application.
+     */
+    do_action( 'wp_authorize_application_password_request_errors', $error, $request, $user );
+
+    if ( $error->has_errors() ) {
+        return $error;
+    }
+
+    return true;
 }

Spacing +170 added lines, -170 removed lines

@@ -27,128 +27,128 @@ 
  * @param int $user_id Optional. User ID.
  * @return int|WP_Error User ID of the updated user or WP_Error on failure.
  */
-function edit_user( $user_id = 0 ) {
+function edit_user($user_id = 0) {
 	$wp_roles = wp_roles();
 	$user     = new stdClass;
 	$user_id  = (int) $user_id;
-	if ( $user_id ) {
+	if ($user_id) {
 		$update           = true;
 		$user->ID         = $user_id;
-		$userdata         = get_userdata( $user_id );
-		$user->user_login = wp_slash( $userdata->user_login );
+		$userdata         = get_userdata($user_id);
+		$user->user_login = wp_slash($userdata->user_login);
 	} else {
 		$update = false;
 	}
 
-	if ( ! $update && isset( $_POST['user_login'] ) ) {
-		$user->user_login = sanitize_user( wp_unslash( $_POST['user_login'] ), true );
+	if (!$update && isset($_POST['user_login'])) {
+		$user->user_login = sanitize_user(wp_unslash($_POST['user_login']), true);
 	}
 
 	$pass1 = '';
 	$pass2 = '';
-	if ( isset( $_POST['pass1'] ) ) {
-		$pass1 = trim( $_POST['pass1'] );
+	if (isset($_POST['pass1'])) {
+		$pass1 = trim($_POST['pass1']);
 	}
-	if ( isset( $_POST['pass2'] ) ) {
-		$pass2 = trim( $_POST['pass2'] );
+	if (isset($_POST['pass2'])) {
+		$pass2 = trim($_POST['pass2']);
 	}
 
-	if ( isset( $_POST['role'] ) && current_user_can( 'promote_users' ) && ( ! $user_id || current_user_can( 'promote_user', $user_id ) ) ) {
-		$new_role = sanitize_text_field( $_POST['role'] );
+	if (isset($_POST['role']) && current_user_can('promote_users') && (!$user_id || current_user_can('promote_user', $user_id))) {
+		$new_role = sanitize_text_field($_POST['role']);
 
 		// If the new role isn't editable by the logged-in user die with error.
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[ $new_role ] ) ) {
-			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
+		if (!empty($new_role) && empty($editable_roles[$new_role])) {
+			wp_die(__('Sorry, you are not allowed to give users that role.'), 403);
 		}
 
-		$potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
+		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 
 		/*
 		 * Don't let anyone with 'promote_users' edit their own role to something without it.
 		 * Multisite super admins can freely edit their roles, they possess all caps.
 		 */
 		if (
-			( is_multisite() && current_user_can( 'manage_network_users' ) ) ||
+			(is_multisite() && current_user_can('manage_network_users')) ||
 			get_current_user_id() !== $user_id ||
-			( $potential_role && $potential_role->has_cap( 'promote_users' ) )
+			($potential_role && $potential_role->has_cap('promote_users'))
 		) {
 			$user->role = $new_role;
 		}
 	}
 
-	if ( isset( $_POST['email'] ) ) {
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	if (isset($_POST['email'])) {
+		$user->user_email = sanitize_text_field(wp_unslash($_POST['email']));
 	}
-	if ( isset( $_POST['url'] ) ) {
-		if ( empty( $_POST['url'] ) || 'http://' === $_POST['url'] ) {
+	if (isset($_POST['url'])) {
+		if (empty($_POST['url']) || 'http://' === $_POST['url']) {
 			$user->user_url = '';
 		} else {
-			$user->user_url = esc_url_raw( $_POST['url'] );
-			$protocols      = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
-			$user->user_url = preg_match( '/^(' . $protocols . '):/is', $user->user_url ) ? $user->user_url : 'http://' . $user->user_url;
+			$user->user_url = esc_url_raw($_POST['url']);
+			$protocols      = implode('|', array_map('preg_quote', wp_allowed_protocols()));
+			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://' . $user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) ) {
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
+	if (isset($_POST['first_name'])) {
+		$user->first_name = sanitize_text_field($_POST['first_name']);
 	}
-	if ( isset( $_POST['last_name'] ) ) {
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
+	if (isset($_POST['last_name'])) {
+		$user->last_name = sanitize_text_field($_POST['last_name']);
 	}
-	if ( isset( $_POST['nickname'] ) ) {
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
+	if (isset($_POST['nickname'])) {
+		$user->nickname = sanitize_text_field($_POST['nickname']);
 	}
-	if ( isset( $_POST['display_name'] ) ) {
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	if (isset($_POST['display_name'])) {
+		$user->display_name = sanitize_text_field($_POST['display_name']);
 	}
 
-	if ( isset( $_POST['description'] ) ) {
-		$user->description = trim( $_POST['description'] );
+	if (isset($_POST['description'])) {
+		$user->description = trim($_POST['description']);
 	}
 
-	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[ $method ] ) ) {
-			$user->$method = sanitize_text_field( $_POST[ $method ] );
+	foreach (wp_get_user_contact_methods($user) as $method => $name) {
+		if (isset($_POST[$method])) {
+			$user->$method = sanitize_text_field($_POST[$method]);
 		}
 	}
 
-	if ( isset( $_POST['locale'] ) ) {
-		$locale = sanitize_text_field( $_POST['locale'] );
-		if ( 'site-default' === $locale ) {
+	if (isset($_POST['locale'])) {
+		$locale = sanitize_text_field($_POST['locale']);
+		if ('site-default' === $locale) {
 			$locale = '';
-		} elseif ( '' === $locale ) {
+		} elseif ('' === $locale) {
 			$locale = 'en_US';
-		} elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+		} elseif (!in_array($locale, get_available_languages(), true)) {
 			$locale = '';
 		}
 
 		$user->locale = $locale;
 	}
 
-	if ( $update ) {
-		$user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
-		$user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
-		$user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
-		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+	if ($update) {
+		$user->rich_editing         = isset($_POST['rich_editing']) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
+		$user->syntax_highlighting  = isset($_POST['syntax_highlighting']) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
+		$user->admin_color          = isset($_POST['admin_color']) ? sanitize_text_field($_POST['admin_color']) : 'fresh';
+		$user->show_admin_bar_front = isset($_POST['admin_bar_front']) ? 'true' : 'false';
 	}
 
-	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' === $_POST['comment_shortcuts'] ? 'true' : '';
+	$user->comment_shortcuts = isset($_POST['comment_shortcuts']) && 'true' === $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( ! empty( $_POST['use_ssl'] ) ) {
+	if (!empty($_POST['use_ssl'])) {
 		$user->use_ssl = 1;
 	}
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( '' === $user->user_login ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
+	if ('' === $user->user_login) {
+		$errors->add('user_login', __('<strong>Error</strong>: Please enter a username.'));
 	}
 
 	/* checking that nickname has been typed */
-	if ( $update && empty( $user->nickname ) ) {
-		$errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
+	if ($update && empty($user->nickname)) {
+		$errors->add('nickname', __('<strong>Error</strong>: Please enter a nickname.'));
 	}
 
 	/**
@@ -160,51 +160,51 @@ 
 	 * @param string $pass1     The password (passed by reference).
 	 * @param string $pass2     The confirmed password (passed by reference).
 	 */
-	do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
+	do_action_ref_array('check_passwords', array($user->user_login, &$pass1, &$pass2));
 
 	// Check for blank password when adding a user.
-	if ( ! $update && empty( $pass1 ) ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+	if (!$update && empty($pass1)) {
+		$errors->add('pass', __('<strong>Error</strong>: Please enter a password.'), array('form-field' => 'pass1'));
 	}
 
 	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
+	if (false !== strpos(wp_unslash($pass1), '\\')) {
+		$errors->add('pass', __('<strong>Error</strong>: Passwords may not contain the character "\\".'), array('form-field' => 'pass1'));
 	}
 
 	// Checking the password has been typed twice the same.
-	if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
-		$errors->add( 'pass', __( '<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+	if (($update || !empty($pass1)) && $pass1 != $pass2) {
+		$errors->add('pass', __('<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.'), array('form-field' => 'pass1'));
 	}
 
-	if ( ! empty( $pass1 ) ) {
+	if (!empty($pass1)) {
 		$user->user_pass = $pass1;
 	}
 
-	if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+	if (!$update && isset($_POST['user_login']) && !validate_username($_POST['user_login'])) {
+		$errors->add('user_login', __('<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 	}
 
-	if ( ! $update && username_exists( $user->user_login ) ) {
-		$errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
+	if (!$update && username_exists($user->user_login)) {
+		$errors->add('user_login', __('<strong>Error</strong>: This username is already registered. Please choose another one.'));
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user->user_login), array_map('strtolower', $illegal_logins), true)) {
+		$errors->add('invalid_username', __('<strong>Error</strong>: Sorry, that username is not allowed.'));
 	}
 
 	/* checking email address */
-	if ( empty( $user->user_email ) ) {
-		$errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
-	} elseif ( ! is_email( $user->user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ), array( 'form-field' => 'email' ) );
+	if (empty($user->user_email)) {
+		$errors->add('empty_email', __('<strong>Error</strong>: Please enter an email address.'), array('form-field' => 'email'));
+	} elseif (!is_email($user->user_email)) {
+		$errors->add('invalid_email', __('<strong>Error</strong>: The email address is not correct.'), array('form-field' => 'email'));
 	} else {
-		$owner_id = email_exists( $user->user_email );
-		if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
-			$errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
+		$owner_id = email_exists($user->user_email);
+		if ($owner_id && (!$update || ($owner_id != $user->ID))) {
+			$errors->add('email_exists', __('<strong>Error</strong>: This email is already registered. Please choose another one.'), array('form-field' => 'email'));
 		}
 	}
 
@@ -217,17 +217,17 @@ 
 	 * @param bool     $update Whether this is a user update.
 	 * @param stdClass $user   User object (passed by reference).
 	 */
-	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
+	do_action_ref_array('user_profile_update_errors', array(&$errors, $update, &$user));
 
-	if ( $errors->has_errors() ) {
+	if ($errors->has_errors()) {
 		return $errors;
 	}
 
-	if ( $update ) {
-		$user_id = wp_update_user( $user );
+	if ($update) {
+		$user_id = wp_update_user($user);
 	} else {
-		$user_id = wp_insert_user( $user );
-		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
+		$user_id = wp_insert_user($user);
+		$notify  = isset($_POST['send_user_notification']) ? 'both' : 'admin';
 
 		/**
 		 * Fires after a new user has been created.
@@ -238,7 +238,7 @@ 
 		 * @param string       $notify  Type of notification that should happen. See
 		 *                              wp_send_new_user_notifications() for more information.
 		 */
-		do_action( 'edit_user_created_user', $user_id, $notify );
+		do_action('edit_user_created_user', $user_id, $notify);
 	}
 	return $user_id;
 }
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param array[] $all_roles Array of arrays containing role information.
 	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
+	$editable_roles = apply_filters('editable_roles', $all_roles);
 
 	return $editable_roles;
 }
@@ -282,10 +282,10 @@ 
  * @param int $user_id User ID.
  * @return WP_User|false WP_User object on success, false on failure.
  */
-function get_user_to_edit( $user_id ) {
-	$user = get_userdata( $user_id );
+function get_user_to_edit($user_id) {
+	$user = get_userdata($user_id);
 
-	if ( $user ) {
+	if ($user) {
 		$user->filter = 'edit';
 	}
 
@@ -302,9 +302,9 @@ 
  * @param int $user_id User ID.
  * @return array
  */
-function get_users_drafts( $user_id ) {
+function get_users_drafts($user_id) {
 	global $wpdb;
-	$query = $wpdb->prepare( "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id );
+	$query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);
 
 	/**
 	 * Filters the user's drafts query string.
@@ -313,8 +313,8 @@ 
 	 *
 	 * @param string $query The user's drafts query string.
 	 */
-	$query = apply_filters( 'get_users_drafts', $query );
-	return $wpdb->get_results( $query );
+	$query = apply_filters('get_users_drafts', $query);
+	return $wpdb->get_results($query);
 }
 
 /**
@@ -333,24 +333,24 @@ 
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */
-function wp_delete_user( $id, $reassign = null ) {
+function wp_delete_user($id, $reassign = null) {
 	global $wpdb;
 
-	if ( ! is_numeric( $id ) ) {
+	if (!is_numeric($id)) {
 		return false;
 	}
 
 	$id   = (int) $id;
-	$user = new WP_User( $id );
+	$user = new WP_User($id);
 
-	if ( ! $user->exists() ) {
+	if (!$user->exists()) {
 		return false;
 	}
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
-	if ( 'novalue' === $reassign ) {
+	if ('novalue' === $reassign) {
 		$reassign = null;
-	} elseif ( null !== $reassign ) {
+	} elseif (null !== $reassign) {
 		$reassign = (int) $reassign;
 	}
 
@@ -365,14 +365,14 @@ 
 	 *                           Default null, for no reassignment.
 	 * @param WP_User  $user     WP_User object of the user to delete.
 	 */
-	do_action( 'delete_user', $id, $reassign, $user );
+	do_action('delete_user', $id, $reassign, $user);
 
-	if ( null === $reassign ) {
+	if (null === $reassign) {
 		$post_types_to_delete = array();
-		foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
-			if ( $post_type->delete_with_user ) {
+		foreach (get_post_types(array(), 'objects') as $post_type) {
+			if ($post_type->delete_with_user) {
 				$post_types_to_delete[] = $post_type->name;
-			} elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+			} elseif (null === $post_type->delete_with_user && post_type_supports($post_type->name, 'author')) {
 				$post_types_to_delete[] = $post_type->name;
 			}
 		}
@@ -385,53 +385,53 @@ 
 		 * @param string[] $post_types_to_delete Array of post types to delete.
 		 * @param int      $id                   User ID.
 		 */
-		$post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
-		$post_types_to_delete = implode( "', '", $post_types_to_delete );
-		$post_ids             = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
-		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id ) {
-				wp_delete_post( $post_id );
+		$post_types_to_delete = apply_filters('post_types_to_delete_with_user', $post_types_to_delete, $id);
+		$post_types_to_delete = implode("', '", $post_types_to_delete);
+		$post_ids             = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id));
+		if ($post_ids) {
+			foreach ($post_ids as $post_id) {
+				wp_delete_post($post_id);
 			}
 		}
 
 		// Clean links.
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
 
-		if ( $link_ids ) {
-			foreach ( $link_ids as $link_id ) {
-				wp_delete_link( $link_id );
+		if ($link_ids) {
+			foreach ($link_ids as $link_id) {
+				wp_delete_link($link_id);
 			}
 		}
 	} else {
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-		$wpdb->update( $wpdb->posts, array( 'post_author' => $reassign ), array( 'post_author' => $id ) );
-		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id ) {
-				clean_post_cache( $post_id );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id));
+		$wpdb->update($wpdb->posts, array('post_author' => $reassign), array('post_author' => $id));
+		if (!empty($post_ids)) {
+			foreach ($post_ids as $post_id) {
+				clean_post_cache($post_id);
 			}
 		}
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
-		$wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
-		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id ) {
-				clean_bookmark_cache( $link_id );
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
+		$wpdb->update($wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id));
+		if (!empty($link_ids)) {
+			foreach ($link_ids as $link_id) {
+				clean_bookmark_cache($link_id);
 			}
 		}
 	}
 
 	// FINALLY, delete user.
-	if ( is_multisite() ) {
-		remove_user_from_blog( $id, get_current_blog_id() );
+	if (is_multisite()) {
+		remove_user_from_blog($id, get_current_blog_id());
 	} else {
-		$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-		foreach ( $meta as $mid ) {
-			delete_metadata_by_mid( 'user', $mid );
+		$meta = $wpdb->get_col($wpdb->prepare("SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id));
+		foreach ($meta as $mid) {
+			delete_metadata_by_mid('user', $mid);
 		}
 
-		$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+		$wpdb->delete($wpdb->users, array('ID' => $id));
 	}
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	/**
 	 * Fires immediately after a user is deleted from the database.
@@ -444,7 +444,7 @@ 
 	 *                           Default null, for no reassignment.
 	 * @param WP_User  $user     WP_User object of the deleted user.
 	 */
-	do_action( 'deleted_user', $id, $reassign, $user );
+	do_action('deleted_user', $id, $reassign, $user);
 
 	return true;
 }
@@ -456,10 +456,10 @@ 
  *
  * @param int $id User ID.
  */
-function wp_revoke_user( $id ) {
+function wp_revoke_user($id) {
 	$id = (int) $id;
 
-	$user = new WP_User( $id );
+	$user = new WP_User($id);
 	$user->remove_all_caps();
 }
 
@@ -470,19 +470,19 @@ 
  *
  * @param false $errors Deprecated.
  */
-function default_password_nag_handler( $errors = false ) {
+function default_password_nag_handler($errors = false) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option( 'default_password_nag' ) ) {
+	if (!get_user_option('default_password_nag')) {
 		return;
 	}
 
 	// get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
-	if ( 'hide' === get_user_setting( 'default_password_nag' )
-		|| isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag']
+	if ('hide' === get_user_setting('default_password_nag')
+		|| isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag']
 	) {
-		delete_user_setting( 'default_password_nag' );
-		update_user_meta( $user_ID, 'default_password_nag', false );
+		delete_user_setting('default_password_nag');
+		update_user_meta($user_ID, 'default_password_nag', false);
 	}
 }
 
@@ -492,18 +492,18 @@ 
  * @param int     $user_ID
  * @param WP_User $old_data
  */
-function default_password_nag_edit_user( $user_ID, $old_data ) {
+function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
-	if ( ! get_user_option( 'default_password_nag', $user_ID ) ) {
+	if (!get_user_option('default_password_nag', $user_ID)) {
 		return;
 	}
 
-	$new_data = get_userdata( $user_ID );
+	$new_data = get_userdata($user_ID);
 
 	// Remove the nag if the password has been changed.
-	if ( $new_data->user_pass != $old_data->user_pass ) {
-		delete_user_setting( 'default_password_nag' );
-		update_user_meta( $user_ID, 'default_password_nag', false );
+	if ($new_data->user_pass != $old_data->user_pass) {
+		delete_user_setting('default_password_nag');
+		update_user_meta($user_ID, 'default_password_nag', false);
 	}
 }
 
@@ -516,17 +516,17 @@ 
 	global $pagenow;
 
 	// Short-circuit it.
-	if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
+	if ('profile.php' === $pagenow || !get_user_option('default_password_nag')) {
 		return;
 	}
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';
-	echo '<strong>' . __( 'Notice:' ) . '</strong> ';
-	_e( 'You&rsquo;re using the auto-generated password for your account. Would you like to change it?' );
+	echo '<strong>' . __('Notice:') . '</strong> ';
+	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it?');
 	echo '</p><p>';
-	printf( '<a href="%s">' . __( 'Yes, take me to my profile page' ) . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __( 'No thanks, do not remind me again' ) . '</a>', '?default_password_nag=0' );
+	printf('<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password');
+	printf('<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0');
 	echo '</p></div>';
 }
 
@@ -559,11 +559,11 @@ 
  *
  * @param WP_User $user User data object.
  */
-function use_ssl_preference( $user ) {
+function use_ssl_preference($user) {
 	?>
 	<tr class="user-use-ssl-wrap">
-		<th scope="row"><?php _e( 'Use https' ); ?></th>
-		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked( '1', $user->use_ssl ); ?> /> <?php _e( 'Always use https when visiting the admin' ); ?></label></td>
+		<th scope="row"><?php _e('Use https'); ?></th>
+		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
 	</tr>
 	<?php
 }
@@ -574,14 +574,14 @@ 
  * @param string $text
  * @return string
  */
-function admin_created_user_email( $text ) {
+function admin_created_user_email($text) {
 	$roles = get_editable_roles();
-	$role  = $roles[ $_REQUEST['role'] ];
+	$role  = $roles[$_REQUEST['role']];
 
-	if ( '' !== get_bloginfo( 'name' ) ) {
-		$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+	if ('' !== get_bloginfo('name')) {
+		$site_title = wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 	} else {
-		$site_title = parse_url( home_url(), PHP_URL_HOST );
+		$site_title = parse_url(home_url(), PHP_URL_HOST);
 	}
 
 	return sprintf(
@@ -598,7 +598,7 @@ 
 		),
 		$site_title,
 		home_url(),
-		wp_specialchars_decode( translate_user_role( $role['name'] ) )
+		wp_specialchars_decode(translate_user_role($role['name']))
 	);
 }
 
@@ -618,35 +618,35 @@ 
  * @param WP_User $user The user authorizing the application.
  * @return true|WP_Error True if the request is valid, a WP_Error object contains errors if not.
  */
-function wp_is_authorize_application_password_request_valid( $request, $user ) {
+function wp_is_authorize_application_password_request_valid($request, $user) {
 	$error = new WP_Error();
 
-	if ( ! empty( $request['success_url'] ) ) {
-		$scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
+	if (!empty($request['success_url'])) {
+		$scheme = wp_parse_url($request['success_url'], PHP_URL_SCHEME);
 
-		if ( 'http' === $scheme ) {
+		if ('http' === $scheme) {
 			$error->add(
 				'invalid_redirect_scheme',
-				__( 'The success URL must be served over a secure connection.' )
+				__('The success URL must be served over a secure connection.')
 			);
 		}
 	}
 
-	if ( ! empty( $request['reject_url'] ) ) {
-		$scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
+	if (!empty($request['reject_url'])) {
+		$scheme = wp_parse_url($request['reject_url'], PHP_URL_SCHEME);
 
-		if ( 'http' === $scheme ) {
+		if ('http' === $scheme) {
 			$error->add(
 				'invalid_redirect_scheme',
-				__( 'The rejection URL must be served over a secure connection.' )
+				__('The rejection URL must be served over a secure connection.')
 			);
 		}
 	}
 
-	if ( ! empty( $request['app_id'] ) && ! wp_is_uuid( $request['app_id'] ) ) {
+	if (!empty($request['app_id']) && !wp_is_uuid($request['app_id'])) {
 		$error->add(
 			'invalid_app_id',
-			__( 'The application ID must be a UUID.' )
+			__('The application ID must be a UUID.')
 		);
 	}
 
@@ -659,9 +659,9 @@ 
 	 * @param array    $request The array of request data.
 	 * @param WP_User  $user    The user authorizing the application.
 	 */
-	do_action( 'wp_authorize_application_password_request_errors', $error, $request, $user );
+	do_action('wp_authorize_application_password_request_errors', $error, $request, $user);
 
-	if ( $error->has_errors() ) {
+	if ($error->has_errors()) {
 		return $error;
 	}