Wizard 2.8.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / plugin-install.php

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 57e24bd73753702f79d6352c1ea17e92547e4600..f81ecc82d9f842266c8165a5b601de5a2274089a 100644 (file)
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -40,12 +40,14 @@ function plugins_api($action, $args = null) {
        if ( ! $res ) {
                $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
                if ( is_wp_error($request) ) {
        if ( ! $res ) {
                $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( '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.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
+                       $res = new WP_Error('plugins_api_failed', __('An Unexpected HTTP Error occurred during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );

                } else {
                        $res = unserialize($request['body']);
                        if ( ! $res )
                } else {
                        $res = unserialize($request['body']);
                        if ( ! $res )

-                               $res = new WP_Error('plugins_api_failed', __('An unknown error occured'), $request['body']);
+                               $res = new WP_Error('plugins_api_failed', __('An unknown error occurred'), $request['body']);

                }
                }

+       } elseif ( !is_wp_error($res) ) {
+               $res->external = true;

        }
 
        return apply_filters('plugins_api_result', $res, $action, $args);
        }
 
        return apply_filters('plugins_api_result', $res, $action, $args);


@@ -125,24 +127,11 @@ function install_dashboard() {
        <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
 
        <h4><?php _e('Search') ?></h4>
        <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> or upload a plugin in .zip format via this page.') ?></p>
 
        <h4><?php _e('Search') ?></h4>

-       <?php install_search_form('<a href="' . add_query_arg('show-help', !isset($_REQUEST['show-help'])) .'" onclick="jQuery(\'#search-help\').toggle(); return false;">' . __('[need help?]') . '</a>') ?>
-       <div id="search-help" style="display: <?php echo isset($_REQUEST['show-help']) ? 'block' : 'none'; ?>;">
-       <p>     <?php _e('You may search based on 3 criteria:') ?><br />
-               <?php _e('<strong>Term:</strong> Searches plugins names and descriptions for the specified term') ?><br />
-               <?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br />
-               <?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p>
-       </div>
-
-       <h4><?php _e('Install a plugin in .zip format') ?></h4>
-       <p><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
-       <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('plugin-install.php?tab=upload') ?>">
-               <?php wp_nonce_field( 'plugin-upload') ?>
-               <input type="file" name="pluginzip" />
-               <input type="submit" class="button" value="<?php _e('Install Now') ?>" />
-       </form>
+       <p class="install-help"><?php _e('Search for plugins by keyword, author, or tag.') ?></p>
+       <?php install_search_form(); ?>

 
        <h4><?php _e('Popular tags') ?></h4>
 
        <h4><?php _e('Popular tags') ?></h4>

-       <p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
+       <p class="install-help"><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>

        <?php
 
        $api_tags = install_popular_tags();
        <?php
 
        $api_tags = install_popular_tags();


@@ -151,11 +140,13 @@ function install_dashboard() {
        $tags = array();
        foreach ( (array)$api_tags as $tag )
                $tags[ $tag['name'] ] = (object) array(
        $tags = array();
        foreach ( (array)$api_tags as $tag )
                $tags[ $tag['name'] ] = (object) array(

-                                                               'link' => clean_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
+                                                               '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'] );
                                                                'name' => $tag['name'],
                                                                'id' => sanitize_title_with_dashes($tag['name']),
                                                                'count' => $tag['count'] );

+       echo '<p class="popular-tags">';

        echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );
        echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) );

+       echo '</p><br class="clear" />';

 }
 
 /**
 }
 
 /**


@@ -167,14 +158,15 @@ function install_search_form(){
        $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
        $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
 
        $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
        $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
 

-       ?><form id="search-plugins" method="post" action="<?php echo admin_url('plugin-install.php?tab=search') ?>">
+       ?><form id="search-plugins" method="post" action="<?php echo admin_url('plugin-install.php?tab=search'); ?>">

                <select name="type" id="typeselector">
                <select name="type" id="typeselector">

-                       <option value="term"<?php selected('term', $type) ?>><?php _e('Term') ?></option>
-                       <option value="author"<?php selected('author', $type) ?>><?php _e('Author') ?></option>
-                       <option value="tag"<?php selected('tag', $type) ?>><?php _e('Tag') ?></option>
+                       <option value="term"<?php selected('term', $type) ?>><?php _e('Term'); ?></option>
+                       <option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
+                       <option value="tag"<?php selected('tag', $type) ?>><?php echo _x('Tag', 'Plugin Installer'); ?></option>

                </select>
                </select>

-               <input type="text" name="s" id="search-field" value="<?php echo attribute_escape($term) ?>" />
-               <input type="submit" name="search" value="<?php echo attribute_escape(__('Search')) ?>" class="button" />
+               <input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
+               <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
+               <input type="submit" id="plugin-search-input" name="search" value="<?php esc_attr_e('Search Plugins'); ?>" class="button" />

        </form><?php
 }
 
        </form><?php
 }
 


@@ -208,6 +200,26 @@ function install_popular($page = 1) {
        display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']);
 }
 
        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
+ *
+ * @param string $page
+ */
+function install_plugins_upload( $page = 1 ) {
+?>
+       <h4><?php _e('Install a plugin in .zip format') ?></h4>
+       <p class="install-help"><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
+       <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-plugin') ?>">
+               <?php wp_nonce_field( 'plugin-upload') ?>
+               <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
+               <input type="file" id="pluginzip" name="pluginzip" />
+               <input type="submit" class="button" value="<?php esc_attr_e('Install Now') ?>" />
+       </form>
+<?php
+}
+

 add_action('install_plugins_new', 'install_new', 10, 1);
 /**
  * Display new plugins.
 add_action('install_plugins_new', 'install_new', 10, 1);
 /**
  * Display new plugins.


@@ -254,7 +266,8 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
 
        $plugins_allowedtags = array('a' => array('href' => array(),'title' => array(), 'target' => array()),
                                                                'abbr' => array('title' => array()),'acronym' => array('title' => 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());
+                                                               'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+                                                               'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array());

 
 ?>
        <div class="tablenav">
 
 ?>
        <div class="tablenav">


@@ -262,7 +275,7 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
                <?php do_action('install_plugins_table_header'); ?>
                </div>
                <?php
                <?php do_action('install_plugins_table_header'); ?>
                </div>
                <?php

-                       $url = clean_url($_SERVER['REQUEST_URI']);
+                       $url = esc_url($_SERVER['REQUEST_URI']);

                        if ( ! empty($term) )
                                $url = add_query_arg('s', $term, $url);
                        if ( ! empty($type) )
                        if ( ! empty($term) )
                                $url = add_query_arg('s', $term, $url);
                        if ( ! empty($type) )


@@ -313,7 +326,17 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
                                        $plugin = (array) $plugin;
 
                                $title = wp_kses($plugin['name'], $plugins_allowedtags);
                                        $plugin = (array) $plugin;
 
                                $title = wp_kses($plugin['name'], $plugins_allowedtags);

-                               $description = wp_kses($plugin['description'], $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) . '&#8230;';
+                               //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 => <br>
+                               $description = nl2br($description);

                                $version = wp_kses($plugin['version'], $plugins_allowedtags);
 
                                $name = strip_tags($title . ' ' . $version);
                                $version = wp_kses($plugin['version'], $plugins_allowedtags);
 
                                $name = strip_tags($title . ' ' . $version);


@@ -325,12 +348,12 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
                                $author = wp_kses($author, $plugins_allowedtags);
 
                                if( isset($plugin['homepage']) )
                                $author = wp_kses($author, $plugins_allowedtags);
 
                                if( isset($plugin['homepage']) )

-                                       $title = '<a target="_blank" href="' . attribute_escape($plugin['homepage']) . '">' . $title . '</a>';
+                                       $title = '<a target="_blank" href="' . esc_attr($plugin['homepage']) . '">' . $title . '</a>';

 
                                $action_links = array();
                                $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
 
                                $action_links = array();
                                $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .

-                                                                       '&amp;TB_iframe=true&amp;width=600&amp;height=800') . '" class="thickbox onclick" title="' .
-                                                                       attribute_escape($name) . '">' . __('Install') . '</a>';
+                                                                       '&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox onclick" title="' .
+                                                                       esc_attr($name) . '">' . __('Install') . '</a>';

 
                                $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
                        ?>
 
                                $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
                        ?>


@@ -338,8 +361,8 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
                                <td class="name"><?php echo $title; ?></td>
                                <td class="vers"><?php echo $version; ?></td>
                                <td class="vers">
                                <td class="name"><?php echo $title; ?></td>
                                <td class="vers"><?php echo $version; ?></td>
                                <td class="vers">

-                                       <div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>">
-                                               <div class="star star-rating" style="width: <?php echo attribute_escape($plugin['rating']) ?>px"></div>
+                                       <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $plugin['num_ratings']), number_format_i18n($plugin['num_ratings'])) ?>">
+                                               <div class="star star-rating" style="width: <?php echo esc_attr($plugin['rating']) ?>px"></div>

                                                <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
                                                <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
                                                <div class="star star3"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('3 stars') ?>" /></div>
                                                <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
                                                <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
                                                <div class="star star3"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('3 stars') ?>" /></div>


@@ -347,7 +370,7 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
                                                <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
                                        </div>
                                </td>
                                                <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
                                        </div>
                                </td>

-                               <td class="desc"><p><?php echo $description, $author; ?></p></td>
+                               <td class="desc"><?php echo $description, $author; ?></td>

                                <td class="action-links"><?php if ( !empty($action_links) )     echo implode(' | ', $action_links); ?></td>
                        </tr>
                        <?php
                                <td class="action-links"><?php if ( !empty($action_links) )     echo implode(' | ', $action_links); ?></td>
                        </tr>
                        <?php


@@ -406,8 +429,8 @@ function install_plugin_information() {
 
                $class = ( $section_name == $section ) ? ' class="current"' : '';
                $href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
 
                $class = ( $section_name == $section ) ? ' class="current"' : '';
                $href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );

-               $href = clean_url($href);
-               $san_title = attribute_escape(sanitize_title_with_dashes($title));
+               $href = esc_url($href);
+               $san_title = esc_attr(sanitize_title_with_dashes($title));

                echo "\t<li><a name='$san_title' target='' href='$href'$class>$title</a></li>\n";
        }
        echo "</ul>\n";
                echo "\t<li><a name='$san_title' target='' href='$href'$class>$title</a></li>\n";
        }
        echo "</ul>\n";


@@ -420,26 +443,28 @@ function install_plugin_information() {
                        //Default to a "new" plugin
                        $type = 'install';
                        //Check to see if this plugin is known to be installed, and has an update awaiting it.
                        //Default to a "new" plugin
                        $type = 'install';
                        //Check to see if this plugin is known to be installed, and has an update awaiting it.

-                       $update_plugins = get_option('update_plugins');
-                       foreach ( (array)$update_plugins->response as $file => $plugin ) {
-                               if ( $plugin->slug === $api->slug ) {
-                                       $type = 'update_available';
-                                       $update_file = $file;
-                                       break;
+                       $update_plugins = get_transient('update_plugins');
+                       if ( is_object( $update_plugins ) ) {
+                               foreach ( (array)$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 ( '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'], '>') ){
+                                       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
                                                $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');
+                                               delete_transient('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';
                                        }
                                                $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';
                                        }


@@ -450,7 +475,7 @@ function install_plugin_information() {
                                default:
                                case 'install':
                                        if ( current_user_can('install_plugins') ) :
                                default:
                                case 'install':
                                        if ( current_user_can('install_plugins') ) :

-                               ?><a href="<?php echo wp_nonce_url(admin_url('plugin-install.php?tab=install&plugin=' . $api->slug), 'install-plugin_' . $api->slug) ?>" target="_parent"><?php _e('Install Now') ?></a><?php
+                               ?><a href="<?php echo wp_nonce_url(admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug) ?>" target="_parent"><?php _e('Install Now') ?></a><?php

                                        endif;
                                break;
                                case 'update_available':
                                        endif;
                                break;
                                case 'update_available':


@@ -485,30 +510,34 @@ function install_plugin_information() {
 <?php endif; if ( ! empty($api->tested) ) : ?>
                        <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
 <?php endif; if ( ! empty($api->downloaded) ) : ?>
 <?php endif; if ( ! empty($api->tested) ) : ?>
                        <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
 <?php endif; if ( ! empty($api->downloaded) ) : ?>

-                       <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(__ngettext('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
-<?php endif; if ( ! empty($api->slug) ) : ?>
+                       <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
+<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>

                        <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
 <?php endif; if ( ! empty($api->homepage) ) : ?>
                        <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
 <?php endif; ?>
                </ul>
                        <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
 <?php endif; if ( ! empty($api->homepage) ) : ?>
                        <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
 <?php endif; ?>
                </ul>

+               <?php if ( ! empty($api->rating) ) : ?>

                <h2><?php _e('Average Rating') ?></h2>
                <h2><?php _e('Average Rating') ?></h2>

-               <div class="star-holder" title="<?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
-                       <div class="star star-rating" style="width: <?php echo attribute_escape($api->rating) ?>px"></div>
+               <div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
+                       <div class="star star-rating" style="width: <?php echo esc_attr($api->rating) ?>px"></div>

                        <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
                        <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
                        <div class="star star3"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('3 stars') ?>" /></div>
                        <div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div>
                        <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
                </div>
                        <div class="star star5"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('5 stars') ?>" /></div>
                        <div class="star star4"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('4 stars') ?>" /></div>
                        <div class="star star3"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('3 stars') ?>" /></div>
                        <div class="star star2"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('2 stars') ?>" /></div>
                        <div class="star star1"><img src="<?php echo admin_url('images/star.gif'); ?>" alt="<?php _e('1 star') ?>" /></div>
                </div>

-               <small><?php printf(__ngettext('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
+               <small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
+               <?php endif; ?>

        </div>
        <div id="section-holder" class="wrap">
        <?php
        </div>
        <div id="section-holder" class="wrap">
        <?php

-               if ( version_compare($GLOBALS['wp_version'], $api->tested, '>') )
+               if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') )

                        echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
                        echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';

-               else if ( version_compare($GLOBALS['wp_version'], $api->requires, '<') )
-                       echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has not been marked as <strong>compatible</strong> with your version of WordPress.') . '</p></div>';
+
+               else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') )
+                       echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+

                foreach ( (array)$api->sections as $section_name => $content ) {
                        $title = $section_name;
                        $title[0] = strtoupper($title[0]);
                foreach ( (array)$api->sections as $section_name => $content ) {
                        $title = $section_name;
                        $title[0] = strtoupper($title[0]);


@@ -517,7 +546,7 @@ function install_plugin_information() {
                        $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
                        $content = links_add_target($content, '_blank');
 
                        $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
                        $content = links_add_target($content, '_blank');
 

-                       $san_title = attribute_escape(sanitize_title_with_dashes($title));
+                       $san_title = esc_attr(sanitize_title_with_dashes($title));

 
                        $display = ( $section_name == $section ) ? 'block' : 'none';
 
 
                        $display = ( $section_name == $section ) ? 'block' : 'none';
 


@@ -531,364 +560,3 @@ function install_plugin_information() {
        iframe_footer();
        exit;
 }
        iframe_footer();
        exit;
 }

-
-
-add_action('install_plugins_upload', 'upload_plugin');
-function upload_plugin() {
-
-       if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-               wp_die($uploads['error']);
-
-       if ( !empty($_FILES) )
-               $filename = $_FILES['pluginzip']['name'];
-       else if ( isset($_GET['package']) )
-               $filename = $_GET['package'];
-
-       check_admin_referer('plugin-upload');
-
-       echo '<div class="wrap">';
-       echo '<h2>', sprintf( __('Installing Plugin from file: %s'), basename($filename) ), '</h2>';
-
-       //Handle a newly uploaded file, Else assume it was
-       if ( !empty($_FILES) ) {
-               $filename = wp_unique_filename( $uploads['basedir'], $filename );
-               $local_file = $uploads['basedir'] . '/' . $filename;
-
-               // Move the file to the uploads dir
-               if ( false === @ move_uploaded_file( $_FILES['pluginzip']['tmp_name'], $local_file) )
-                       wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
-       } else {
-               $local_file = $uploads['basedir'] . '/' . $filename;
-       }
-
-       do_plugin_install_local_package($local_file, $filename);
-       echo '</div>';
-}
-
-add_action('install_plugins_install', 'install_plugin');
-
-/**
- * Display plugin link and execute install.
- *
- * @since 2.7.0
- */
-function install_plugin() {
-
-       $plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-       check_admin_referer('install-plugin_' . $plugin);
-       $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-
-       if ( is_wp_error($api) )
-               wp_die($api);
-
-       echo '<div class="wrap">';
-       echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
-
-       do_plugin_install($api->download_link, $api);
-       echo '</div>';
-
-}
-
-/**
- * Retrieve plugin and install.
- *
- * @since 2.7.0
- *
- * @param string $download_url Download URL.
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install($download_url, $plugin_information = null) {
-       global $wp_filesystem;
-
-       if ( empty($download_url) ) {
-               show_message( __('No plugin Specified') );
-               return;
-       }
-
-       $plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-       $url = 'plugin-install.php?tab=install';
-       $url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => stripslashes( $_REQUEST['plugin_name'] ), 'download_url' => stripslashes( $_REQUEST['download_url'] ) ), $url);
-
-       $url = wp_nonce_url($url, 'install-plugin_' . $plugin);
-       if ( false === ($credentials = request_filesystem_credentials($url)) )
-               return;
-
-       if ( ! WP_Filesystem($credentials) ) {
-               request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-               return;
-       }
-
-       if ( $wp_filesystem->errors->get_error_code() ) {
-               foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                       show_message($message);
-               return;
-       }
-
-       $result = wp_install_plugin( $download_url, 'show_message' );
-
-       if ( is_wp_error($result) ) {
-               show_message($result);
-               show_message( __('Installation Failed') );
-       } else {
-               show_message( sprintf(__('Successfully installed the plugin <strong>%s %s</strong>.'), $plugin_information->name, $plugin_information->version) );
-               $plugin_file = $result;
-
-               $install_actions = apply_filters('install_plugin_complete_actions', array(
-                       'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . attribute_escape(__('Activate this plugin')) . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                       'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . attribute_escape(__('Goto plugins page')) . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-                                                       ), $plugin_information, $plugin_file);
-               if ( ! empty($install_actions) )
-                       show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-       }
-}
-
-/**
- * Install a plugin from a local file.
- *
- * @since 2.7.0
- *
- * @param string $package Local Plugin zip
- * @param string $filename Optional. Original filename
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install_local_package($package, $filename = '') {
-       global $wp_filesystem;
-
-       if ( empty($package) ) {
-               show_message( __('No plugin Specified') );
-               return;
-       }
-
-       if ( empty($filename) )
-               $filename = basename($package);
-
-       $url = 'plugin-install.php?tab=upload';
-       $url = add_query_arg(array('package' => $filename), $url);
-
-       $url = wp_nonce_url($url, 'plugin-upload');
-       if ( false === ($credentials = request_filesystem_credentials($url)) )
-               return;
-
-       if ( ! WP_Filesystem($credentials) ) {
-               request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-               return;
-       }
-
-       if ( $wp_filesystem->errors->get_error_code() ) {
-               foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                       show_message($message);
-               return;
-       }
-
-       $result = wp_install_plugin_local_package( $package, 'show_message' );
-
-       if ( is_wp_error($result) ) {
-               show_message($result);
-               show_message( __('Installation Failed') );
-       } else {
-               show_message( __('Successfully installed the plugin.') );
-               $plugin_file = $result;
-
-               $install_actions = apply_filters('install_plugin_complete_actions', array(
-                                                       'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                                                       'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . __('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-                                                       ), array(), $plugin_file);
-               if ( ! empty($install_actions) )
-                       show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-       }
-}
-
-/**
- * Install plugin.
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin($package, $feedback = '') {
-       global $wp_filesystem;
-
-       if ( !empty($feedback) )
-               add_filter('install_feedback', $feedback);
-
-       // Is a filesystem accessor setup?
-       if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
-               WP_Filesystem();
-
-       if ( ! is_object($wp_filesystem) )
-               return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-       if ( $wp_filesystem->errors->get_error_code() )
-               return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
-       //Get the base plugin folder
-       $plugins_dir = $wp_filesystem->wp_plugins_dir();
-       if ( empty($plugins_dir) )
-               return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-       //And the same for the Content directory.
-       $content_dir = $wp_filesystem->wp_content_dir();
-       if( empty($content_dir) )
-               return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-       $plugins_dir = trailingslashit( $plugins_dir );
-       $content_dir = trailingslashit( $content_dir );
-
-       if ( empty($package) )
-               return new WP_Error('no_package', __('Install package not available.'));
-
-       // Download the package
-       apply_filters('install_feedback', sprintf(__('Downloading plugin package from %s'), $package));
-       $download_file = download_url($package);
-
-       if ( is_wp_error($download_file) )
-               return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-       $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-       // Clean up working directory
-       if ( $wp_filesystem->is_dir($working_dir) )
-               $wp_filesystem->delete($working_dir, true);
-
-       apply_filters('install_feedback', __('Unpacking the plugin package'));
-       // Unzip package to working directory
-       $result = unzip_file($download_file, $working_dir);
-
-       // Once extracted, delete the package
-       @unlink($download_file);
-
-       if ( is_wp_error($result) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return $result;
-       }
-
-       //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-       $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-       if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-       }
-
-       apply_filters('install_feedback', __('Installing the plugin'));
-       // Copy new version of plugin into place.
-       $result = copy_dir($working_dir, $plugins_dir);
-       if ( is_wp_error($result) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return $result;
-       }
-
-       //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-       $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-       // Remove working directory
-       $wp_filesystem->delete($working_dir, true);
-
-       if( empty($filelist) )
-               return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-       $folder = $filelist[0];
-       $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-       $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-       //Return the plugin files name.
-       return  $folder . '/' . $pluginfiles[0];
-}
-
-/**
- * Install plugin from local package
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin_local_package($package, $feedback = '') {
-       global $wp_filesystem;
-
-       if ( !empty($feedback) )
-               add_filter('install_feedback', $feedback);
-
-       // Is a filesystem accessor setup?
-       if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
-               WP_Filesystem();
-
-       if ( ! is_object($wp_filesystem) )
-               return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
-
-       if ( $wp_filesystem->errors->get_error_code() )
-               return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
-
-       //Get the base plugin folder
-       $plugins_dir = $wp_filesystem->wp_plugins_dir();
-       if ( empty($plugins_dir) )
-               return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-       //And the same for the Content directory.
-       $content_dir = $wp_filesystem->wp_content_dir();
-       if( empty($content_dir) )
-               return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-       $plugins_dir = trailingslashit( $plugins_dir );
-       $content_dir = trailingslashit( $content_dir );
-
-       if ( empty($package) )
-               return new WP_Error('no_package', __('Install package not available.'));
-
-       $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-       // Clean up working directory
-       if ( $wp_filesystem->is_dir($working_dir) )
-               $wp_filesystem->delete($working_dir, true);
-
-       apply_filters('install_feedback', __('Unpacking the plugin package'));
-       // Unzip package to working directory
-       $result = unzip_file($package, $working_dir);
-
-       // Once extracted, delete the package
-       unlink($package);
-
-       if ( is_wp_error($result) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return $result;
-       }
-
-       //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-       $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-       if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-       }
-
-       apply_filters('install_feedback', __('Installing the plugin'));
-       // Copy new version of plugin into place.
-       $result = copy_dir($working_dir, $plugins_dir);
-       if ( is_wp_error($result) ) {
-               $wp_filesystem->delete($working_dir, true);
-               return $result;
-       }
-
-       //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
-       $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-       // Remove working directory
-       $wp_filesystem->delete($working_dir, true);
-
-       if( empty($filelist) )
-               return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-       $folder = $filelist[0];
-       $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-       $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-       //Return the plugin files name.
-       return  $folder . '/' . $pluginfiles[0];
-}
-
-?>