X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/includes/plugin-install.php diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 57e24bd7..1c07b685 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 @@ -24,28 +24,33 @@ * * @param string $action * @param array|object $args Optional. Arguments to serialize for the Plugin Info API. - * @return mixed + * @return object plugins_api response object on success, WP_Error on failure. */ function plugins_api($action, $args = null) { - if( is_array($args) ) + if ( is_array($args) ) $args = (object)$args; if ( !isset($args->per_page) ) $args->per_page = 24; - $args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter. - $res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API. + // Allows a plugin to override the WordPress.org API entirely. + // 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); - if ( ! $res ) { - $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) ); + if ( false === $res ) { + $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'timeout' => 15, 'body' => array('action' => $action, 'request' => serialize($args))) ); if ( is_wp_error($request) ) { - $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occured during the API request.
Try again'), $request->get_error_message() ); + $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); } else { - $res = unserialize($request['body']); - if ( ! $res ) - $res = new WP_Error('plugins_api_failed', __('An unknown error occured'), $request['body']); + $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); + if ( ! is_object( $res ) && ! is_array( $res ) ) + $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); } + } elseif ( !is_wp_error($res) ) { + $res->external = true; } return apply_filters('plugins_api_result', $res, $action, $args); @@ -60,313 +65,198 @@ 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, 3 * HOUR_IN_SECONDS ); 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.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>
- ' . __('[need help?]') . '') ?> -
- Term: Searches plugins names and descriptions for the specified term') ?>
- Tag: Searches for plugins tagged as such') ?>
- Author: Searches for plugins created by the Author, or which the Author contributed to.') ?>
- | - | - | - | - |
---|---|---|---|---|
- | - | - | - | - | ', __('No plugins match your request.'), ' | '; - - foreach( (array) $plugins as $plugin ){ - if ( is_object($plugin) ) - $plugin = (array) $plugin; - - $title = wp_kses($plugin['name'], $plugins_allowedtags); - $description = wp_kses($plugin['description'], $plugins_allowedtags); - $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); - - if( isset($plugin['homepage']) ) - $title = '' . $title . ''; - - $action_links = array(); - $action_links[] = '' . __('Install') . ''; - - $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin); - ?> -
- | - |
-
-
-
-
-
-
-
-
- |
- - | - |
' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '
' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '
' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '