enmi-conf.org: comparison wp/wp-admin/includes/class-wp-theme-install-list-table.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	public $features = array();
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
 		return current_user_can( 'install_themes' );
 	}
 	/**
-	 *
 	 * @global array  $tabs
 	 * @global string $tab
 	 * @global int    $paged
 	 * @global string $type
 	 * @global array  $theme_field_defaults
 		include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 		global $tabs, $tab, $paged, $type, $theme_field_defaults;
 		wp_reset_vars( array( 'tab' ) );
-		$search_terms = array();
+		$search_terms  = array();
 		$search_string = '';
-		if ( ! empty( $_REQUEST['s'] ) ){
+		if ( ! empty( $_REQUEST['s'] ) ) {
 			$search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-			$search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+			$search_terms  = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
 		}
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty( $_REQUEST['features'] ) ) {
 			$this->features = $_REQUEST['features'];
+		}
 		$paged = $this->get_pagenum();
 		$per_page = 36;
 		// These are the tabs which are shown on the page,
-		$tabs = array();
+		$tabs              = array();
 		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab )
+		if ( 'search' === $tab ) {
-			$tabs['search']	= __( 'Search Results' );
+			$tabs['search'] = __( 'Search Results' );
-		$tabs['upload'] = __( 'Upload' );
+		}
+		$tabs['upload']   = __( 'Upload' );
 		$tabs['featured'] = _x( 'Featured', 'themes' );
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
-		$tabs['new']      = _x( 'Latest', 'themes' );
+		$tabs['new']     = _x( 'Latest', 'themes' );
-		$tabs['updated']  = _x( 'Recently Updated', 'themes' );
+		$tabs['updated'] = _x( 'Recently Updated', 'themes' );
 		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
 		/** This filter is documented in wp-admin/theme-install.php */
 		$tabs = apply_filters( 'install_themes_tabs', $tabs );
 		/**
 		 * Filters tabs not associated with a menu item on the Install Themes screen.
 		 *
 		 * @since 2.8.0
 		 *
-		 * @param array $nonmenu_tabs The tabs that don't have a menu item on
+		 * @param string[] $nonmenu_tabs The tabs that don't have a menu item on
-		 *                            the Install Themes screen.
+		 *                               the Install Themes screen.
 		 */
 		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
+		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
 			$tab = key( $tabs );
+		}
-		$args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
+		$args = array(
+			'page'     => $paged,
+			'per_page' => $per_page,
+			'fields'   => $theme_field_defaults,
+		);
 		switch ( $tab ) {
 			case 'search':
 				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 				switch ( $type ) {
 						$args['author'] = $search_string;
 						break;
 				}
 				if ( ! empty( $this->features ) ) {
-					$args['tag'] = $this->features;
+					$args['tag']      = $this->features;
-					$_REQUEST['s'] = implode( ',', $this->features );
+					$_REQUEST['s']    = implode( ',', $this->features );
 					$_REQUEST['type'] = 'tag';
 				}
 				add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
 				break;
 			case 'featured':
-			// case 'popular':
+				// case 'popular':
 			case 'new':
 			case 'updated':
 				$args['browse'] = $tab;
 				break;
 		 *
 		 * @param array $args An array of themes API arguments.
 		 */
 		$args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
-		if ( ! $args )
+		if ( ! $args ) {
 			return;
+		}
 		$api = themes_api( 'query_themes', $args );
-		if ( is_wp_error( $api ) )
+		if ( is_wp_error( $api ) ) {
 			wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		}
 		$this->items = $api->themes;
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(
-			'total_items' => $api->info['results'],
+			array(
-			'per_page' => $args['per_page'],
+				'total_items'     => $api->info['results'],
-			'infinite_scroll' => true,
+				'per_page'        => $args['per_page'],
-		) );
+				'infinite_scroll' => true,
+			)
+		);
 	}
 	/**
 	 */
 	public function no_items() {
 		_e( 'No themes match your request.' );
 	}
 	/**
-	 *
 	 * @global array $tabs
 	 * @global string $tab
 	 * @return array
 	 */
 	protected function get_views() {
 		global $tabs, $tab;
 		$display_tabs = array();
 		foreach ( (array) $tabs as $action => $text ) {
-			$current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
+			$current_link_attributes                    = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
-			$href = self_admin_url('theme-install.php?tab=' . $action);
+			$href                                       = self_admin_url( 'theme-install.php?tab=' . $action );
-			$display_tabs['theme-install-'.$action] = "<a href='$href'$current_link_attributes>$text</a>";
+			$display_tabs[ 'theme-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
 		}
 		return $display_tabs;
 	}
 	/**
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
+		?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
 				<?php
 				/**
 				 * Fires in the Install Themes list table header.
 	/**
 	 */
 	public function display_rows() {
 		$themes = $this->items;
 		foreach ( $themes as $theme ) {
+			?>
+				<div class="available-theme installable-theme">
+				<?php
+					$this->single_row( $theme );
 				?>
-				<div class="available-theme installable-theme"><?php
+				</div>
-					$this->single_row( $theme );
+			<?php
-				?></div>
+		} // end foreach $theme_names
-		<?php } // end foreach $theme_names
 		$this->theme_installer();
 	}
 	/**
 	 * @global array $themes_allowedtags
 	 *
 	 * @param object $theme {
 	 *     An object that contains theme data returned by the WordPress.org API.
 	 *
-	 *     @type string $name           Theme name, e.g. 'Twenty Seventeen'.
+	 *     @type string $name           Theme name, e.g. 'Twenty Nineteen'.
-	 *     @type string $slug           Theme slug, e.g. 'twentyseventeen'.
+	 *     @type string $slug           Theme slug, e.g. 'twentynineteen'.
 	 *     @type string $version        Theme version, e.g. '1.1'.
 	 *     @type string $author         Theme author username, e.g. 'melchoyce'.
-	 *     @type string $preview_url    Preview URL, e.g. 'http://2017.wordpress.net/'.
+	 *     @type string $preview_url    Preview URL, e.g. 'http://2019.wordpress.net/'.
-	 *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+	 *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
 	 *     @type float  $rating         Rating score.
 	 *     @type int    $num_ratings    The number of ratings.
-	 *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+	 *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentynineteen/'.
 	 *     @type string $description    Theme description.
 	 *     @type string $download_link  Theme ZIP download URL.
 	 * }
 	 */
 	public function single_row( $theme ) {
 		global $themes_allowedtags;
-		if ( empty( $theme ) )
+		if ( empty( $theme ) ) {
 			return;
+		}
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
+		$name   = wp_kses( $theme->name, $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
-		$preview_title = sprintf( __('Preview &#8220;%s&#8221;'), $name );
+		/* translators: %s: theme name */
-		$preview_url   = add_query_arg( array(
+		$preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
-			'tab'   => 'theme-information',
+		$preview_url   = add_query_arg(
-			'theme' => $theme->slug,
+			array(
-		), self_admin_url( 'theme-install.php' ) );
+				'tab'   => 'theme-information',
+				'theme' => $theme->slug,
+			),
+			self_admin_url( 'theme-install.php' )
+		);
 		$actions = array();
-		$install_url = add_query_arg( array(
+		$install_url = add_query_arg(
-			'action' => 'install-theme',
+			array(
-			'theme'  => $theme->slug,
+				'action' => 'install-theme',
-		), self_admin_url( 'update.php' ) );
+				'theme'  => $theme->slug,
+			),
-		$update_url = add_query_arg( array(
+			self_admin_url( 'update.php' )
-			'action' => 'upgrade-theme',
+		);
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$update_url = add_query_arg(
+			array(
+				'action' => 'upgrade-theme',
+				'theme'  => $theme->slug,
+			),
+			self_admin_url( 'update.php' )
+		);
 		$status = $this->_get_theme_status( $theme );
 		switch ( $status ) {
 			case 'update_available':
-				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+				$actions[] = sprintf(
+					'<a class="install-now" href="%s" title="%s">%s</a>',
+					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+					/* translators: %s: theme version */
+					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
+					__( 'Update' )
+				);
 				break;
 			case 'newer_installed':
 			case 'latest_installed':
-				$actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+				$actions[] = sprintf(
+					'<span class="install-now" title="%s">%s</span>',
+					esc_attr__( 'This theme is already installed and is up to date' ),
+					_x( 'Installed', 'theme' )
+				);
 				break;
 			case 'install':
 			default:
-				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+				$actions[] = sprintf(
-				break;
+					'<a class="install-now" href="%s" title="%s">%s</a>',
-		}
+					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+					/* translators: %s: theme name */
-		$actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
+					esc_attr( sprintf( __( 'Install %s' ), $name ) ),
+					__( 'Install Now' )
+				);
+				break;
+		}
+		$actions[] = sprintf(
+			'<a class="install-theme-preview" href="%s" title="%s">%s</a>',
+			esc_url( $preview_url ),
+			/* translators: %s: theme name */
+			esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
+			__( 'Preview' )
+		);
 		/**
 		 * Filters the install action links for a theme in the Install Themes list table.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param array    $actions An array of theme action hyperlinks. Defaults are
+		 * @param string[] $actions An array of theme action links. Defaults are
 		 *                          links to Install Now, Preview, and Details.
 		 * @param WP_Theme $theme   Theme object.
 		 */
 		$actions = apply_filters( 'theme_install_actions', $actions, $theme );
 		<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
 			<img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
 		</a>
 		<h3><?php echo $name; ?></h3>
-		<div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+		<div class="theme-author">
+		<?php
+			/* translators: %s: theme author */
+			printf( __( 'By %s' ), $author );
+		?>
+		</div>
 		<div class="action-links">
 			<ul>
-				<?php foreach ( $actions as $action ): ?>
+				<?php foreach ( $actions as $action ) : ?>
 					<li><?php echo $action; ?></li>
 				<?php endforeach; ?>
-				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
+				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e( 'Details' ); ?></a></li>
 			</ul>
 		</div>
 		<?php
 		$this->install_theme_info( $theme );
 	 * @param object $theme - A WordPress.org Theme API object.
 	 */
 	public function install_theme_info( $theme ) {
 		global $themes_allowedtags;
-		if ( empty( $theme ) )
+		if ( empty( $theme ) ) {
 			return;
+		}
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
+		$name   = wp_kses( $theme->name, $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
-		$install_url = add_query_arg( array(
+		$install_url = add_query_arg(
-			'action' => 'install-theme',
+			array(
-			'theme'  => $theme->slug,
+				'action' => 'install-theme',
-		), self_admin_url( 'update.php' ) );
+				'theme'  => $theme->slug,
+			),
-		$update_url = add_query_arg( array(
+			self_admin_url( 'update.php' )
-			'action' => 'upgrade-theme',
+		);
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$update_url = add_query_arg(
+			array(
+				'action' => 'upgrade-theme',
+				'theme'  => $theme->slug,
+			),
+			self_admin_url( 'update.php' )
+		);
 		$status = $this->_get_theme_status( $theme );
 		?>
-		<div class="install-theme-info"><?php
+		<div class="install-theme-info">
-			switch ( $status ) {
+		<?php
-				case 'update_available':
+		switch ( $status ) {
-					echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+			case 'update_available':
-					break;
+				printf(
-				case 'newer_installed':
+					'<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
-				case 'latest_installed':
+					esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
-					echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+					/* translators: %s: theme version */
-					break;
+					esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
-				case 'install':
+					__( 'Update' )
-				default:
+				);
-					echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+				break;
-					break;
+			case 'newer_installed':
-			} ?>
+			case 'latest_installed':
+				printf(
+					'<span class="theme-install" title="%s">%s</span>',
+					esc_attr__( 'This theme is already installed and is up to date' ),
+					_x( 'Installed', 'theme' )
+				);
+				break;
+			case 'install':
+			default:
+				printf(
+					'<a class="theme-install button button-primary" href="%s">%s</a>',
+					esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+					__( 'Install' )
+				);
+				break;
+		}
+		?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
-			<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
+			<span class="theme-by">
-			<?php if ( isset( $theme->screenshot_url ) ): ?>
+			<?php
+				/* translators: %s: theme author */
+				printf( __( 'By %s' ), $author );
+			?>
+			</span>
+			<?php if ( isset( $theme->screenshot_url ) ) : ?>
 				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
-				<?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
+				<?php
+				wp_star_rating(
+					array(
+						'rating' => $theme->rating,
+						'type'   => 'percent',
+						'number' => $theme->num_ratings,
+					)
+				);
+				?>
 				<div class="theme-version">
-					<strong><?php _e('Version:') ?> </strong>
+					<strong><?php _e( 'Version:' ); ?> </strong>
 					<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
 				</div>
 				<div class="theme-description">
 					<?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
 				</div>
 	private function _get_theme_status( $theme ) {
 		$status = 'install';
 		$installed_theme = wp_get_theme( $theme->slug );
 		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
+			if ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '=' ) ) {
 				$status = 'latest_installed';
-			elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
+			} elseif ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '>' ) ) {
 				$status = 'newer_installed';
-			else
+			} else {
 				$status = 'update_available';
+			}
 		}
 		return $status;
 	}
 }

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4