X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..fa11948979fd6a4ea5705dc613b239699a459db3:/wp-admin/includes/plugin-install.php
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index ca3e1f5b..7f1e0f2c 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
@@ -34,26 +34,65 @@ function plugins_api($action, $args = null) {
if ( !isset($args->per_page) )
$args->per_page = 24;
- // Allows a plugin to override the WordPress.org API entirely.
- // Use the filter 'plugins_api_result' to mearly 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);
+ /**
+ * Override the Plugin Install API arguments.
+ *
+ * Please ensure that an object is returned.
+ *
+ * @since 2.7.0
+ *
+ * @param object $args Plugin API arguments.
+ * @param string $action The type of information being requested from the Plugin Install API.
+ */
+ $args = apply_filters( 'plugins_api_args', $args, $action );
+
+ /**
+ * Allows a plugin to override the WordPress.org Plugin Install API entirely.
+ *
+ * Please ensure that an object is returned.
+ *
+ * @since 2.7.0
+ *
+ * @param bool|object The result object. Default is false.
+ * @param string $action The type of information being requested from the Plugin Install API.
+ * @param object $args Plugin API arguments.
+ */
+ $res = apply_filters( 'plugins_api', false, $action, $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))) );
+ $url = 'http://api.wordpress.org/plugins/info/1.0/';
+ if ( wp_http_supports( array( 'ssl' ) ) )
+ $url = set_url_scheme( $url, 'https' );
+
+ $request = wp_remote_post( $url, 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.'), $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( wp_remote_retrieve_body( $request ) );
- if ( false === $res )
- $res = new WP_Error('plugins_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
+ $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);
+ /**
+ * Filter the Plugin Install API response results.
+ *
+ * @since 2.7.0
+ *
+ * @param object|WP_Error $res Response object or WP_Error.
+ * @param string $action The type of information being requested from the Plugin Install API.
+ * @param object $args Plugin API arguments.
+ */
+ return apply_filters( 'plugins_api_result', $res, $action, $args );
}
/**
@@ -74,18 +113,17 @@ function install_popular_tags( $args = array() ) {
if ( is_wp_error($tags) )
return $tags;
- set_site_transient('poptags_' . $key, $tags, 10800); // 3 * 60 * 60 = 10800
+ set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
return $tags;
}
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' ) ); ?>
-
-
+
@@ -97,7 +135,7 @@ 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(
@@ -105,7 +143,7 @@ function install_dashboard() {
'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 '
';
}
@@ -116,18 +154,20 @@ add_action('install_plugins_dashboard', 'install_dashboard');
*
* @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'] ) : '';
?>
-
-
-
+
+
+ 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_updated', 'display_plugins_table');
+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' );
/**
* Determine the status we can perform on a plugin.
@@ -175,7 +238,7 @@ add_action('install_plugins_updated', 'display_plugins_table');
* @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;
@@ -185,7 +248,7 @@ function install_plugin_install_status($api, $loop = 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 ( is_object( $update_plugins ) ) {
+ if ( isset( $update_plugins->response ) ) {
foreach ( (array)$update_plugins->response as $file => $plugin ) {
if ( $plugin->slug === $api->slug ) {
$status = 'update_available';
@@ -199,13 +262,14 @@ function install_plugin_install_status($api, $loop = false) {
}
if ( 'install' == $status ) {
- if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
+ if ( is_dir( WP_PLUGIN_DIR . '/' . $api->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_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
+ $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'], '<') ) {
@@ -227,7 +291,7 @@ function install_plugin_install_status($api, $loop = false) {
}
}
if ( isset($_GET['from']) )
- $url .= '&from=' . urlencode(stripslashes($_GET['from']));
+ $url .= '&from=' . urlencode( wp_unslash( $_GET['from'] ) );
return compact('status', 'url', 'version');
}
@@ -240,40 +304,58 @@ function install_plugin_install_status($api, $loop = false) {
function install_plugin_information() {
global $tab;
- $api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) ));
+ $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) );
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 = array_shift( $section_titles = array_keys((array)$api->sections) );
+ $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_titles = array_keys( (array) $api->sections );
+ $section = array_shift( $section_titles );
+ }
iframe_header( __('Plugin Install') );
echo "\n";
@@ -318,20 +400,15 @@ function install_plugin_information() {
downloaded) ) : ?>
downloaded), number_format_i18n($api->downloaded)) ?>
slug) && empty($api->external) ) : ?>
-
+
homepage) ) : ?>
-
+
rating) ) : ?>
num_ratings), number_format_i18n($api->num_ratings)); ?>
@@ -345,18 +422,20 @@ function install_plugin_information() {
echo '' . __('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";