WordPress 3.9

[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 37d862e0f5770ded6d7f4db9463d76d2f77a1ff8..44a6a1b4c436c6742aea164b55327802b2b3608f 100644 (file)
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -53,7 +53,7 @@ function plugins_api($action, $args = null) {
         *
         * @since 2.7.0
         *
         *
         * @since 2.7.0
         *

-        * @param bool|object         The result object. Default is false.
+        * @param bool|object $result The result object. Default false.

         * @param string      $action The type of information being requested from the Plugin Install API.
         * @param object      $args   Plugin API arguments.
         */
         * @param string      $action The type of information being requested from the Plugin Install API.
         * @param object      $args   Plugin API arguments.
         */


@@ -74,16 +74,16 @@ function plugins_api($action, $args = null) {
                $request = wp_remote_post( $url, $args );
 
                if ( $ssl && is_wp_error( $request ) ) {
                $request = wp_remote_post( $url, $args );
 
                if ( $ssl && is_wp_error( $request ) ) {

-                       trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+                       trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );

                        $request = wp_remote_post( $http_url, $args );
                }
 
                if ( is_wp_error($request) ) {
                        $request = wp_remote_post( $http_url, $args );
                }
 
                if ( is_wp_error($request) ) {

-                       $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $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&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );

                } else {
                        $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
                        if ( ! is_object( $res ) && ! is_array( $res ) )
                } else {
                        $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&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+                               $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );

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


@@ -126,7 +126,7 @@ function install_popular_tags( $args = array() ) {
 
 function install_dashboard() {
        ?>
 
 function install_dashboard() {
        ?>

-       <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
+       <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>

 
        <h4><?php _e('Search') ?></h4>
        <?php install_search_form( false ); ?>
 
        <h4><?php _e('Search') ?></h4>
        <?php install_search_form( false ); ?>


@@ -312,8 +312,8 @@ function install_plugin_information() {
 
        $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) );
 
 
        $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) );
 

-       if ( is_wp_error($api) )
-               wp_die($api);
+       if ( is_wp_error( $api ) )
+               wp_die( $api );

 
        $plugins_allowedtags = array(
                'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
 
        $plugins_allowedtags = array(
                'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),


@@ -334,13 +334,17 @@ function install_plugin_information() {
        );
 
        //Sanitize HTML
        );
 
        //Sanitize HTML

-       foreach ( (array)$api->sections as $section_name => $content )
+       foreach ( (array)$api->sections as $section_name => $content ) {

                $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
                $api->sections[$section_name] = wp_kses($content, $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 );
        }
 
        foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) {
                if ( isset( $api->$key ) )
                        $api->$key = wp_kses( $api->$key, $plugins_allowedtags );
        }
 

+       $_tab = esc_attr( $tab );
+

        $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 = 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 );


@@ -348,8 +352,10 @@ function install_plugin_information() {
        }
 
        iframe_header( __('Plugin Install') );
        }
 
        iframe_header( __('Plugin Install') );

-       echo "<div id='$tab-header'>\n";
-       echo "<ul id='sidemenu'>\n";
+
+       echo "<div id='{$_tab}-title'>{$api->name}</div>";
+       echo "<div id='{$_tab}-tabs'>\n";
+

        foreach ( (array)$api->sections as $section_name => $content ) {
 
                if ( isset( $plugins_section_titles[ $section_name ] ) )
        foreach ( (array)$api->sections as $section_name => $content ) {
 
                if ( isset( $plugins_section_titles[ $section_name ] ) )


@@ -359,70 +365,48 @@ 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 = esc_url($href);
+               $href = esc_url( $href );

                $san_section = esc_attr( $section_name );
                $san_section = esc_attr( $section_name );

-               echo "\t<li><a name='$san_section' href='$href' $class>$title</a></li>\n";
+               echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";

        }
        }

-       echo "</ul>\n";
+

        echo "</div>\n";
        echo "</div>\n";

+

        ?>
        ?>

-       <div class="alignright fyi">
-               <?php if ( ! empty($api->download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?>
-               <p class="action-button">
-               <?php
-               $status = install_plugin_install_status($api);
-               switch ( $status['status'] ) {
-                       case 'install':
-                               if ( $status['url'] )
-                                       echo '<a href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
-                               break;
-                       case 'update_available':
-                               if ( $status['url'] )
-                                       echo '<a href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') .'</a>';
-                               break;
-                       case 'newer_installed':
-                               echo '<a>' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . '</a>';
-                               break;
-                       case 'latest_installed':
-                               echo '<a>' . __('Latest Version Installed') . '</a>';
-                               break;
-               }
-               ?>
-               </p>
-               <?php endif; ?>
-               <h2 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h2>
+       <div id="<?php echo $_tab; ?>-content">
+       <div class="fyi">

                <ul>
                <ul>

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

                        <li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
                        <li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>

-<?php endif; if ( ! empty($api->author) ) : ?>
+<?php endif; if ( ! empty( $api->author ) ) : ?>

                        <li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
                        <li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>

-<?php endif; if ( ! empty($api->last_updated) ) : ?>
+<?php endif; if ( ! empty( $api->last_updated ) ) : ?>

                        <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
                                                        printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
                        <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
                                                        printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>

-<?php endif; if ( ! empty($api->requires) ) : ?>
+<?php endif; if ( ! empty( $api->requires ) ) : ?>

                        <li><strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?></li>
                        <li><strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?></li>

-<?php endif; if ( ! empty($api->tested) ) : ?>
+<?php endif; if ( ! empty( $api->tested ) ) : ?>

                        <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
                        <li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>

-<?php endif; if ( ! empty($api->downloaded) ) : ?>
+<?php endif; if ( ! empty( $api->downloaded ) ) : ?>

                        <li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
                        <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/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
-<?php endif; if ( ! empty($api->homepage) ) : ?>
+<?php endif; if ( ! empty( $api->slug ) && empty( $api->external ) ) : ?>
+                       <li><a target="_blank" href="https://wordpress.org/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="<?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>
+               <?php if ( ! empty( $api->rating ) ) : ?>
+               <h3><?php _e('Average Rating') ?></h3>

                <?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>
                <?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>

-               <small><?php printf(_n('(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
                <?php endif; ?>
        </div>
        <div id="section-holder" class="wrap">
        <?php

-               if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $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 ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') )
+               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 ) {
                        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 ) {


@@ -432,19 +416,40 @@ function install_plugin_information() {
                        else
                                $title = ucwords( str_replace( '_', ' ', $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');
+                       $content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' );
+                       $content = links_add_target( $content, '_blank' );

 
                        $san_section = esc_attr( $section_name );
 
                        $display = ( $section_name == $section ) ? 'block' : 'none';
 
                        echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
 
                        $san_section = esc_attr( $section_name );
 
                        $display = ( $section_name == $section ) ? 'block' : 'none';
 
                        echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";

-                       echo "\t\t<h2 class='long-header'>$title</h2>";

                        echo $content;
                        echo "\t</div>\n";
                }
        echo "</div>\n";
                        echo $content;
                        echo "\t</div>\n";
                }
        echo "</div>\n";

+       echo "</div>\n";
+       echo "<div id='$tab-footer'>\n";
+       if ( ! empty( $api->download_link ) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) {
+               $status = install_plugin_install_status($api);
+               switch ( $status['status'] ) {
+                       case 'install':
+                               if ( $status['url'] )
+                                       echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
+                               break;
+                       case 'update_available':
+                               if ( $status['url'] )
+                                       echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') .'</a>';
+                               break;
+                       case 'newer_installed':
+                               echo '<a class="button button-primary right disabled">' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . '</a>';
+                               break;
+                       case 'latest_installed':
+                               echo '<a class="button button-primary right disabled">' . __('Latest Version Installed') . '</a>';
+                               break;
+               }
+       }
+       echo "</div>\n";

 
        iframe_footer();
        exit;
 
        iframe_footer();
        exit;