X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/includes/plugin-install.php
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index bcd9e1b2..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 occurred 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 occurred'), $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,73 +65,26 @@ 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' ) ); ?>
-
-
+
@@ -134,71 +92,48 @@ function install_dashboard() {
$api_tags = install_popular_tags();
- //Set up the tags in a way which can be interprated 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'])) ),
- 'name' => $tag['name'],
- 'id' => sanitize_title_with_dashes($tag['name']),
- 'count' => $tag['count'] );
echo '';
- echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
+ if ( is_wp_error($api_tags) ) {
+ echo $api_tags->get_error_message();
+ } else {
+ //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( 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' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) );
+ }
echo '
';
}
+add_action('install_plugins_dashboard', 'install_dashboard');
/**
* Display search form for searching plugins.
*
* @since 2.7.0
*/
-function install_search_form(){
- $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
- $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
+function install_search_form( $type_selector = true ) {
+ $type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
+ $term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
- ?> 'featured', 'page' => $page);
- $api = plugins_api('query_plugins', $args);
- if ( is_wp_error($api) )
- wp_die($api);
- 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);
- 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
@@ -207,187 +142,121 @@ add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);
*/
function install_plugins_upload( $page = 1 ) {
?>
-
-
-
'new', 'page' => $page);
- $api = plugins_api('query_plugins', $args);
- if ( is_wp_error($api) )
- wp_die($api);
- display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
+function install_plugins_favorites_form() {
+ $user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+ ?>
+
+
+ 'updated', 'page' => $page);
- $api = plugins_api('query_plugins', $args);
- display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
+function display_plugins_table() {
+ global $wp_list_table;
+
+ if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) )
+ return;
+
+ $wp_list_table->display();
}
+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_favorites', 'display_plugins_table' );
/**
- * Display plugin content based on plugin list.
+ * Determine the status we can perform on a plugin.
*
- * @since 2.7.0
- *
- * @param array $plugins List of plugins.
- * @param string $page
- * @param int $totalpages Number of pages.
+ * @since 3.0.0
*/
-function display_plugins_table($plugins, $page = 1, $totalpages = 1){
- $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
- $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
-
- $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());
+function install_plugin_install_status($api, $loop = false) {
+ // this function is called recursively, $loop prevents further loops.
+ if ( is_array($api) )
+ $api = (object) $api;
+
+ //Default to a "new" plugin
+ $status = 'install';
+ $url = false;
+
+ //Check to see if this plugin is known to be installed, and has an update awaiting it.
+ $update_plugins = get_site_transient('update_plugins');
+ if ( isset( $update_plugins->response ) ) {
+ foreach ( (array)$update_plugins->response as $file => $plugin ) {
+ if ( $plugin->slug === $api->slug ) {
+ $status = 'update_available';
+ $update_file = $file;
+ $version = $plugin->new_version;
+ if ( current_user_can('update_plugins') )
+ $url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+ break;
+ }
+ }
+ }
-?>
-
-
-
-
- add_query_arg('paged', '%#%', $url),
- 'format' => '',
- 'prev_text' => __('«'),
- 'next_text' => __('»'),
- 'total' => $totalpages,
- 'current' => $page
- ));
-
- if ( $page_links )
- echo "\t\t
$page_links
";
-?>
-
-
-
-
- |
- |
- |
- |
- |
-
-
-
-
-
- |
- |
- |
- |
- |
-
-
-
-
- ', __('No plugins match your request.'), ' | ';
-
- 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);
-
- if( isset($plugin['homepage']) )
- $title = '' . $title . '';
-
- $action_links = array();
- $action_links[] = '' . __('Install') . '';
-
- $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
- ?>
-
- |
- |
-
-
- |
- |
- |
-
- slug ) ) {
+ $installed_plugin = get_plugins('/' . $api->slug);
+ if ( empty($installed_plugin) ) {
+ if ( current_user_can('install_plugins') )
+ $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+ } else {
+ $key = array_keys( $installed_plugin );
+ $key = array_shift( $key ); //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'], '=') ){
+ $status = 'latest_installed';
+ } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
+ $status = 'newer_installed';
+ $version = $installed_plugin[ $key ]['Version'];
+ } else {
+ //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
+ if ( ! $loop ) {
+ delete_site_transient('update_plugins');
+ wp_update_plugins();
+ return install_plugin_install_status($api, true);
+ }
+ }
}
- ?>
-
-
-
-
- $page_links
"; ?>
-
-
+ } else {
+ // "install" & no directory with that slug
+ if ( current_user_can('install_plugins') )
+ $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+ }
+ }
+ if ( isset($_GET['from']) )
+ $url .= '&from=' . urlencode( wp_unslash( $_GET['from'] ) );
- stripslashes( $_REQUEST['plugin'] ) ));
+ $api = plugins_api('plugin_information', array('slug' => wp_unslash( $_REQUEST['plugin'] ) ));
if ( is_wp_error($api) )
wp_die($api);
- $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(),
- 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
- 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
- 'img' => array('src' => array(), 'class' => array(), 'alt' => array()));
+ $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(),
+ 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
+ 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
+ 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() )
+ );
+
+ $plugins_section_titles = array(
+ 'description' => _x('Description', 'Plugin installer section title'),
+ 'installation' => _x('Installation', 'Plugin installer section title'),
+ 'faq' => _x('FAQ', 'Plugin installer section title'),
+ 'screenshots' => _x('Screenshots', 'Plugin installer section title'),
+ 'changelog' => _x('Changelog', 'Plugin installer section title'),
+ 'other_notes' => _x('Other Notes', 'Plugin installer section title')
+ );
+
//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 ]) )
+ $section = isset($_REQUEST['section']) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
+ if ( empty($section) || ! isset($api->sections[ $section ]) )
$section = array_shift( $section_titles = array_keys((array)$api->sections) );
iframe_header( __('Plugin Install') );
@@ -422,79 +305,45 @@ function install_plugin_information() {
echo "\n";
echo "\n";
?>
- download_link) ) : ?>
+ download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?>
response as $file => $plugin ) {
- if ( $plugin->slug === $api->slug ) {
- $type = 'update_available';
- $update_file = $file;
- break;
- }
- }
- }
- if ( 'install' == $type && is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
- $installed_plugin = get_plugins('/' . $api->slug);
- if ( ! empty($installed_plugin) ) {
- $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'], '=') ){
- $type = 'latest_installed';
- } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
- $type = 'newer_installed';
- $newer_version = $installed_plugin[ $key ]['Version'];
- } else {
- //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
- delete_option('update_plugins');
- $update_file = $api->slug . '/' . $key; //This code branch only deals with a plugin which is in a folder the same name as its slug, Doesnt support plugins which have 'non-standard' names
- $type = 'update_available';
- }
- }
- }
-
- switch ( $type ) :
- default:
- case 'install':
- if ( current_user_can('install_plugins') ) :
- ?>' . __('Install Now') . '';
break;
- case 'update_available':
- if ( current_user_can('update_plugins') ) :
- ?>' . __('Install Update Now') .'';
break;
- case 'newer_installed':
- if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) :
- ?>' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . '';
break;
- case 'latest_installed':
- if ( current_user_can('install_plugins') || current_user_can('update_plugins') ) :
- ?>' . __('Latest Version Installed') . '';
break;
- endswitch; ?>
+ }
+ ?>
-
+
version) ) : ?>
- version ?>
@@ -509,22 +358,19 @@ function install_plugin_information() {
- tested ?>
downloaded) ) : ?>
- downloaded), number_format_i18n($api->downloaded)) ?>
-slug) ) : ?>
-
+ rating) ) : ?>
num_ratings), number_format_i18n($api->num_ratings)); ?>
+
' . __('Warning: This plugin has not been marked as compatible with your version of WordPress.') . '
';
foreach ( (array)$api->sections as $section_name => $content ) {
- $title = $section_name;
- $title[0] = strtoupper($title[0]);
- $title = str_replace('_', ' ', $title);
- $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
+ if ( isset( $plugins_section_titles[ $section_name ] ) )
+ $title = $plugins_section_titles[ $section_name ];
+ else
+ $title = ucwords( str_replace( '_', ' ', $section_name ) );
+
+ $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/');
$content = links_add_target($content, '_blank');
- $san_title = esc_attr(sanitize_title_with_dashes($title));
+ $san_section = esc_attr( $section_name );
$display = ( $section_name == $section ) ? 'block' : 'none';
- echo "\t\n";
+ echo "\t
\n";
echo "\t\t";
echo $content;
echo "\t
\n";
@@ -556,3 +404,4 @@ function install_plugin_information() {
iframe_footer();
exit;
}
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
; ?>)
-