X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..9c2096d803812dacbdf6cf8efe90053e39f00b96:/wp-admin/includes/plugin-install.php?ds=sidebyside diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index f348e609..71cc36dc 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -12,7 +12,7 @@ * It is possible for a plugin to override the Plugin API result with three * filters. Assume this is for plugins, which can extend on the Plugin Info to * offer more choices. This is very powerful and must be used with care, when - * overridding the filters. + * overriding the filters. * * The first filter, 'plugins_api_args', is for the args and gives the action as * the second parameter. The hook for 'plugins_api_args' must ensure that an @@ -35,7 +35,7 @@ function plugins_api($action, $args = null) { $args->per_page = 24; // Allows a plugin to override the WordPress.org API entirely. - // Use the filter 'plugins_api_result' to mearly add results. + // Use the filter 'plugins_api_result' to merely add results. // Please ensure that a object is returned from the following filters. $args = apply_filters('plugins_api_args', $args, $action); $res = apply_filters('plugins_api', false, $action, $args); @@ -45,9 +45,9 @@ function plugins_api($action, $args = null) { if ( is_wp_error($request) ) { $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.'), $request->get_error_message() ); } else { - $res = unserialize($request['body']); + $res = unserialize( wp_remote_retrieve_body( $request ) ); if ( false === $res ) - $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), $request['body']); + $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) ); } } elseif ( !is_wp_error($res) ) { $res->external = true; @@ -65,69 +65,23 @@ function plugins_api($action, $args = null) { * @return array */ function install_popular_tags( $args = array() ) { - if ( ! ($cache = wp_cache_get('popular_tags', 'api')) && ! ($cache = get_option('wporg_popular_tags')) ) - add_option('wporg_popular_tags', array(), '', 'no'); ///No autoload. - - if ( $cache && $cache->timeout + 3 * 60 * 60 > time() ) - return $cache->cached; + $key = md5(serialize($args)); + if ( false !== ($tags = get_site_transient('poptags_' . $key) ) ) + return $tags; $tags = plugins_api('hot_tags', $args); if ( is_wp_error($tags) ) return $tags; - $cache = (object) array('timeout' => time(), 'cached' => $tags); - - update_option('wporg_popular_tags', $cache); - wp_cache_set('popular_tags', $cache, 'api'); + set_site_transient('poptags_' . $key, $tags, 10800); // 3 * 60 * 60 = 10800 return $tags; } -add_action('install_plugins_search', 'install_search', 10, 1); - -/** - * Display search results and display as tag cloud. - * - * @since 2.7.0 - * - * @param string $page - */ -function install_search($page) { - $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; - - $args = array(); - - switch( $type ){ - case 'tag': - $args['tag'] = sanitize_title_with_dashes($term); - break; - case 'term': - $args['search'] = $term; - break; - case 'author': - $args['author'] = $term; - break; - } - $args['page'] = $page; - - $api = plugins_api('query_plugins', $args); - - if ( is_wp_error($api) ) - wp_die($api); - - add_action('install_plugins_table_header', 'install_search_form'); - - display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); - - return; -} - -add_action('install_plugins_dashboard', 'install_dashboard'); function install_dashboard() { ?> -

WordPress Plugin Directory or upload a plugin in .zip format via this page.') ?>

+

WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

@@ -143,18 +97,19 @@ function install_dashboard() { if ( is_wp_error($api_tags) ) { echo $api_tags->get_error_message(); } else { - //Set up the tags in a way which can be interprated by wp_generate_tag_cloud() + //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud() $tags = array(); foreach ( (array)$api_tags as $tag ) $tags[ $tag['name'] ] = (object) array( - 'link' => esc_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ), + 'link' => esc_url( self_admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ), 'name' => $tag['name'], 'id' => sanitize_title_with_dashes($tag['name']), 'count' => $tag['count'] ); - echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) ); + echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) ); } echo '


'; } +add_action('install_plugins_dashboard', 'install_dashboard'); /** * Display search form for searching plugins. @@ -165,7 +120,8 @@ function install_search_form(){ $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; - ?>
+ ?> + - +
'featured', 'page' => $page); - $api = plugins_api('query_plugins', $args); - if ( is_wp_error($api) ) - wp_die($api->get_error_message() . '

' . __('Try again') . ''); - display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); -} - -add_action('install_plugins_popular', 'install_popular', 10, 1); -/** - * Display popular plugins. - * - * @since 2.7.0 - * - * @param string $page - */ -function install_popular($page = 1) { - $args = array('browse' => 'popular', 'page' => $page); - $api = plugins_api('query_plugins', $args); - if ( is_wp_error($api) ) - wp_die($api->get_error_message() . '

' . __('Try again') . ''); - display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); -} - -add_action('install_plugins_upload', 'install_plugins_upload', 10, 1); /** * Upload from zip * @since 2.8.0 @@ -220,7 +143,7 @@ function install_plugins_upload( $page = 1 ) { ?>

-
+ @@ -228,193 +151,23 @@ function install_plugins_upload( $page = 1 ) {
'new', 'page' => $page); - $api = plugins_api('query_plugins', $args); - if ( is_wp_error($api) ) - wp_die($api->get_error_message() . '

' . __('Try again') . ''); - display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); -} -add_action('install_plugins_updated', 'install_updated', 10, 1); - - -/** - * Display recently updated plugins. - * - * @since 2.7.0 - * - * @param string $page - */ -function install_updated($page = 1) { - $args = array('browse' => 'updated', 'page' => $page); - $api = plugins_api('query_plugins', $args); - if ( is_wp_error($api) ) - wp_die($api->get_error_message() . '

' . __('Try again') . ''); - display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); -} +add_action('install_plugins_upload', 'install_plugins_upload', 10, 1); /** * Display plugin content based on plugin list. * * @since 2.7.0 - * - * @param array $plugins List of plugins. - * @param string $page - * @param int $totalpages Number of pages. */ -function display_plugins_table($plugins, $page = 1, $totalpages = 1){ - $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; +function display_plugins_table() { + global $wp_list_table; - $plugins_allowedtags = array('a' => array('href' => array(),'title' => array(), 'target' => array()), - 'abbr' => array('title' => array()),'acronym' => array('title' => array()), - 'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(), - 'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()); - -?> -

-
- -
- add_query_arg('paged', '%#%', $url), - 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => $totalpages, - 'current' => $page - )); - - if ( $page_links ) - echo "\t\t
$page_links
"; -?> -
-
- - - - - - - - - - - - - - - - - - - - - '; - - foreach ( (array) $plugins as $plugin ){ - if ( is_object($plugin) ) - $plugin = (array) $plugin; - - $title = wp_kses($plugin['name'], $plugins_allowedtags); - //Limit description to 400char, and remove any HTML. - $description = strip_tags($plugin['description']); - if ( strlen($description) > 400 ) - $description = mb_substr($description, 0, 400) . '…'; - //remove any trailing entities - $description = preg_replace('/&[^;\s]{0,6}$/', '', $description); - //strip leading/trailing & multiple consecutive lines - $description = trim($description); - $description = preg_replace("|(\r?\n)+|", "\n", $description); - //\n =>
- $description = nl2br($description); - $version = wp_kses($plugin['version'], $plugins_allowedtags); - - $name = strip_tags($title . ' ' . $version); - - $author = $plugin['author']; - if ( ! empty($plugin['author']) ) - $author = ' ' . sprintf( __('By %s'), $author ) . '.'; - - $author = wp_kses($author, $plugins_allowedtags); - - $action_links = array(); - $action_links[] = '' . __('Details') . ''; - - if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) { - $status = install_plugin_install_status($plugin); - - switch ( $status['status'] ) { - case 'install': - if ( $status['url'] ) - $action_links[] = '' . __('Install Now') . ''; - break; - case 'update_available': - if ( $status['url'] ) - $action_links[] = '' . sprintf( __('Update Now'), $status['version'] ) . ''; - break; - case 'latest_installed': - case 'newer_installed': - $action_links[] = '' . __('Installed') . ''; - break; - } - } - - $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin ); - ?> - - - - - - - - -
', __('No plugins match your request.'), '
-
- 		-
-
-
<?php _e('5 stars') ?>
-
<?php _e('4 stars') ?>
-
<?php _e('3 stars') ?>
-
<?php _e('2 stars') ?>
-
<?php _e('1 star') ?>
-
-
- -
- $page_links
"; ?> -
- - -display(); } - -add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); +add_action('install_plugins_search', 'display_plugins_table'); +add_action('install_plugins_featured', 'display_plugins_table'); +add_action('install_plugins_popular', 'display_plugins_table'); +add_action('install_plugins_new', 'display_plugins_table'); +add_action('install_plugins_updated', 'display_plugins_table'); /** * Determine the status we can perform on a plugin. @@ -422,7 +175,7 @@ add_action('install_plugins_pre_plugin-information', 'install_plugin_information * @since 3.0.0 */ function install_plugin_install_status($api, $loop = false) { - // this function is called recursivly, $loop prevents futhur loops. + // this function is called recursively, $loop prevents further loops. if ( is_array($api) ) $api = (object) $api; @@ -439,7 +192,7 @@ function install_plugin_install_status($api, $loop = false) { $update_file = $file; $version = $plugin->new_version; if ( current_user_can('update_plugins') ) - $url = wp_nonce_url(admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file); + $url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file); break; } } @@ -450,7 +203,7 @@ function install_plugin_install_status($api, $loop = false) { $installed_plugin = get_plugins('/' . $api->slug); if ( empty($installed_plugin) ) { if ( current_user_can('install_plugins') ) - $url = wp_nonce_url(admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); + $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); } else { $key = array_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){ @@ -470,7 +223,7 @@ function install_plugin_install_status($api, $loop = false) { } else { // "install" & no directory with that slug if ( current_user_can('install_plugins') ) - $url = wp_nonce_url(admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); + $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug); } } if ( isset($_GET['from']) ) @@ -501,8 +254,10 @@ function install_plugin_information() { //Sanitize HTML foreach ( (array)$api->sections as $section_name => $content ) $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); - foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key ) - $api->$key = wp_kses($api->$key, $plugins_allowedtags); + foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) { + if ( isset( $api->$key ) ) + $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); + } $section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. if ( empty($section) || ! isset($api->sections[ $section ]) ) @@ -574,11 +329,11 @@ function install_plugin_information() {

-
<?php _e('5 stars') ?>
-
<?php _e('4 stars') ?>
-
<?php _e('3 stars') ?>
-
<?php _e('2 stars') ?>
-
<?php _e('1 star') ?>
+
<?php esc_attr_e('5 stars') ?>
+
<?php esc_attr_e('4 stars') ?>
+
<?php esc_attr_e('3 stars') ?>
+
<?php esc_attr_e('2 stars') ?>
+
<?php esc_attr_e('1 star') ?>
num_ratings), number_format_i18n($api->num_ratings)); ?> @@ -613,3 +368,4 @@ function install_plugin_information() { iframe_footer(); exit; } +add_action('install_plugins_pre_plugin-information', 'install_plugin_information');