X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/includes/theme-install.php diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index 1f24e40a..63be1d7e 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -24,22 +24,24 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test * * @since 2.8.0 * - * @deprecated since 3.1.0 Use get_theme_feature_list() instead. + * @deprecated since 3.1.0 Use get_theme_feature_list() instead. * * @return array */ -function install_themes_feature_list( ) { +function install_themes_feature_list() { + _deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' ); + if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) - set_transient( 'wporg_theme_feature_list', array( ), 10800); + set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS ); - if ( $cache ) + if ( $cache ) return $cache; - $feature_list = themes_api( 'feature_list', array( ) ); + $feature_list = themes_api( 'feature_list', array() ); if ( is_wp_error( $feature_list ) ) - return $features; + return array(); - set_transient( 'wporg_theme_feature_list', $feature_list, 10800 ); + set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS ); return $feature_list; } @@ -49,20 +51,38 @@ function install_themes_feature_list( ) { * * @since 2.8.0 */ -function install_theme_search_form() { - $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : ''; +function install_theme_search_form( $type_selector = true ) { + $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term'; + $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : ''; + if ( ! $type_selector ) + echo '

' . __( 'Search for themes by keyword.' ) . '

'; ?> -

-
+ + - + + + + +

-
-

+

+ + + '; foreach ( (array) $feature_list as $feature_name => $features ) { @@ -94,7 +116,7 @@ function install_themes_dashboard() { ?>
  • - +
    • @@ -114,10 +136,10 @@ add_action('install_themes_dashboard', 'install_themes_dashboard'); function install_themes_upload($page = 1) { ?> -

    -

    - - +

    +

    + +
    @@ -125,75 +147,15 @@ function install_themes_upload($page = 1) { } add_action('install_themes_upload', 'install_themes_upload', 10, 1); -function display_theme($theme, $actions = null, $show_details = true) { - global $themes_allowedtags; - - if ( empty($theme) ) - return; - - $name = wp_kses($theme->name, $themes_allowedtags); - $desc = wp_kses($theme->description, $themes_allowedtags); - //if ( strlen($desc) > 30 ) - // $desc = substr($desc, 0, 15) . '...' . substr($desc, -15) . ''; - - $preview_link = $theme->preview_url . '?TB_iframe=true&width=600&height=400'; - if ( !is_array($actions) ) { - $actions = array(); - $actions[] = '' . __('Install') . ''; - if ( !is_network_admin() ) - $actions[] = '' . __('Preview') . ''; - $actions = apply_filters('theme_install_action_links', $actions, $theme); - } - - $actions = implode ( ' | ', $actions ); - ?> -'> - - -

    - -

    - - -
    -

    version, $themes_allowedtags) ?>

    -

    author, $themes_allowedtags) ?>

    -last_updated) ) : ?> -

    last_updated)) ) ?>

    -requires) ) : ?> -

    requires) ?>

    -tested) ) : ?> -

    tested ?>

    -downloaded) ) : ?> -

    downloaded), number_format_i18n($theme->downloaded)) ?>

    - -
    -
    -
    <?php _e('5 stars') ?>
    -
    <?php _e('4 stars') ?>
    -
    <?php _e('3 stars') ?>
    -
    <?php _e('2 stars') ?>
    -
    <?php _e('1 star') ?>
    -
    -
    - string 'Magazine Basic' (length=14) - public 'slug' => string 'magazine-basic' (length=14) - public 'version' => string '1.1' (length=3) - public 'author' => string 'tinkerpriest' (length=12) - public 'preview_url' => string 'http://wp-themes.com/?magazine-basic' (length=36) - public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png' (length=68) - public 'rating' => float 80 - public 'num_ratings' => int 1 - public 'homepage' => string 'http://wordpress.org/extend/themes/magazine-basic' (length=49) - public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by c.bavota of Tinker Priest Media.' (length=214) - public 'download_link' => string 'http://wordpress.org/extend/themes/download/magazine-basic.1.1.zip' (length=66) - */ +/** + * Prints a theme on the Install Themes pages. + * + * @deprecated 3.4.0 + */ +function display_theme( $theme ) { + _deprecated_function( __FUNCTION__, '3.4' ); + global $wp_list_table; + $wp_list_table->single_row( $theme ); } /** @@ -217,107 +179,16 @@ add_action('install_themes_updated', 'display_themes'); * @since 2.8.0 */ function install_theme_information() { - //TODO: This function needs a LOT of UI work :) - global $tab, $themes_allowedtags; + global $tab, $themes_allowedtags, $wp_list_table; - $api = themes_api('theme_information', array('slug' => stripslashes( $_REQUEST['theme'] ) )); + $theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) ); - if ( is_wp_error($api) ) - wp_die($api); - - // Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) - $api->sections[$section_name] = wp_kses($content, $themes_allowedtags); - - foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key ) { - if ( isset($api->$key) ) - $api->$key = wp_kses($api->$key, $themes_allowedtags); - } + if ( is_wp_error( $theme ) ) + wp_die( $theme ); iframe_header( __('Theme Install') ); - - if ( empty($api->download_link) ) { - echo '

    ' . __('Error: This theme is currently not available. Please try again later.') . '

    '; - iframe_footer(); - exit; - } - - if ( !empty($api->tested) && version_compare($GLOBALS['wp_version'], $api->tested, '>') ) - echo '

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

    '; - else if ( !empty($api->requires) && version_compare($GLOBALS['wp_version'], $api->requires, '<') ) - echo '

    ' . __('Warning: This theme has not been marked as compatible with your version of WordPress.') . '

    '; - - // Default to a "new" theme - $type = 'install'; - // Check to see if this theme is known to be installed, and has an update awaiting it. - $update_themes = get_site_transient('update_themes'); - if ( is_object($update_themes) && isset($update_themes->response) ) { - foreach ( (array)$update_themes->response as $theme_slug => $theme_info ) { - if ( $theme_slug === $api->slug ) { - $type = 'update_available'; - $update_file = $theme_slug; - break; - } - } - } - - $themes = get_themes(); - foreach ( $themes as $this_theme ) { - if ( is_array($this_theme) && $this_theme['Stylesheet'] == $api->slug ) { - if ( $this_theme['Version'] == $api->version ) { - $type = 'latest_installed'; - } elseif ( $this_theme['Version'] > $api->version ) { - $type = 'newer_installed'; - $newer_version = $this_theme['Version']; - } - break; - } - } -?> - -
    - -

    name; ?>

    -

    author); ?>

    -

    version); ?>

    - -' . __('Cancel') . ' '; - -switch ( $type ) { -default: -case 'install': - if ( current_user_can('install_themes') ) : - $buttons .= '' . __('Install Now') . ''; - endif; - break; -case 'update_available': - if ( current_user_can('update_themes') ) : - $buttons .= '' . __('Install Update Now') . ''; - endif; - break; -case 'newer_installed': - if ( current_user_can('install_themes') || current_user_can('update_themes') ) : - ?>

    -
    -
    - -

    - -
    -

    - -theme_installer_single( $theme ); iframe_footer(); exit; } add_action('install_themes_pre_theme-information', 'install_theme_information'); -