Index: wp-admin/includes/plugin-install.php =================================================================== --- wp-admin/includes/plugin-install.php (revision 18488) +++ wp-admin/includes/plugin-install.php (working copy) @@ -236,134 +236,160 @@ * Display plugin information in dialog box form. * * @since 2.7.0 + * @param array $data content, title + * @param boolean $framed whether to wrap in admin interface + * @return array $data filtered data (if called as filter) */ -function install_plugin_information() { - global $tab; +function install_plugin_information($data, $framed) { - $api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) )); + global $tab; - if ( is_wp_error($api) ) - wp_die($api); + $api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) )); - $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())); - //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); + if ( is_wp_error($api) ) + wp_die($api); - $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) ); + $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())); + //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); - iframe_header( __('Plugin Install') ); - echo "
\n"; - echo "\n"; - echo "
\n"; - ?> -
- download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?> -

- ' . __('Install Now') . ''; - break; - case 'update_available': - if ( $status['url'] ) - echo '' . __('Install Update Now') .''; - break; - case 'newer_installed': - echo '' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . ''; - break; - case 'latest_installed': - echo '' . __('Latest Version Installed') . ''; - break; - } - ?> -

- -

- - rating) ) : ?> -

-
-
-
<?php _e('5 stars') ?>
-
<?php _e('4 stars') ?>
-
<?php _e('3 stars') ?>
-
<?php _e('2 stars') ?>
-
<?php _e('1 star') ?>
-
- num_ratings), number_format_i18n($api->num_ratings)); ?> - -
-
- tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') ) - echo '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; + $contents .= "
\n"; + $contents .= "\n"; + $contents .= "
\n"; + $contents .= '
'; - $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/'); - $content = links_add_target($content, '_blank'); + if ( ! empty($api->download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) { - $san_title = esc_attr(sanitize_title_with_dashes($title)); + $contents .= '

'; + $status = install_plugin_install_status($api); + switch ( $status['status'] ) { + case 'install': + if ( $status['url'] ) + $contents .= '' . __('Install Now') . ''; + break; + case 'update_available': + if ( $status['url'] ) + $contents .= '' . __('Install Update Now') .''; + break; + case 'newer_installed': + $contents .= '' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . ''; + break; + case 'latest_installed': + $contents .= '' . __('Latest Version Installed') . ''; + break; + } + $contents .= '

'; + + } + + $contents .= '

' . /* translators: For Your Information */ __('FYI') . '

'; + $contents .= ''; + + if ( ! empty($api->rating) ) { + $contents .= '

' . __('Average Rating') . '

'; + $contents .= '
'; - $display = ( $section_name == $section ) ? 'block' : 'none'; + $contents .= '
'; + $contents .= '
' . __('5 stars') . '
'; + $contents .= '
' . __('4 stars') . '
'; + $contents .= '
' . __('3 stars') . '
'; + $contents .= '
' . __('2 stars') . '
'; + $contents .= '
' . __('1 star') . '
'; - echo "\t
\n"; - echo "\t\t

$title

"; - echo $content; - echo "\t
\n"; - } - echo "
\n"; + $contents .= '
'; + $contents .= '' . sprintf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)) . ''; + } + $contents .= '
'; + $contents .= '
'; - iframe_footer(); - exit; + if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') ) + $contents .= '

' . __('Warning: This plugin has not been tested with your current version of WordPress.') . '

'; + + else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') ) + $contents .= '

' . __('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 . '/'); + $content = links_add_target($content, '_blank'); + + $san_title = esc_attr(sanitize_title_with_dashes($title)); + + $display = ( $section_name == $section ) ? 'block' : 'none'; + + $contents .= "\t
\n"; + $contents .= "\t\t

$title

"; + $contents .= $content; + $contents .= "\t
\n"; + } + $contents .= "
\n"; + + if($framed) { + iframe_header( __('Plugin Install') ); + echo $contents; + iframe_footer(); + exit; + } + else { + $data['contents'] = $contents; + $data['title'] = $api->name; + return $data; + } } -add_action('install_plugins_pre_plugin-information', 'install_plugin_information'); +add_filter('install_plugins_pre_plugin-information', 'install_plugin_information', 10, 2); +add_action('install_plugins_pre_plugin-information', 'install_plugin_information', 10, 2); Index: wp-admin/plugin-install.php =================================================================== --- wp-admin/plugin-install.php (revision 18488) +++ wp-admin/plugin-install.php (working copy) @@ -6,7 +6,7 @@ * @subpackage Administration */ // TODO route this pages via a specific iframe handler instead of the do_action below -if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) +if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) && ( !isset($_GET['wrapped']) ) ) define( 'IFRAME_REQUEST', true ); /** WordPress Administration Bootstrap */ @@ -34,7 +34,13 @@ $body_id = $tab; -do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information. +if(defined('IFRAME_REQUEST')) { + do_action('install_plugins_pre_' . $tab, array(), defined('IFRAME_REQUEST')); //Used to override the general interface, Eg, install or plugin information. +} +else { + $data = array('contents' => '', 'title' => $title); + $data = apply_filters('install_plugins_pre_' . $tab, $data, defined('IFRAME_REQUEST')); //Used to override the general interface, Eg, install or plugin information. +} add_contextual_help($current_screen, '

' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from WordPress core by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '

' . @@ -50,10 +56,10 @@ ?>
-

+

views(); ?> - +