X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..HEAD:/wp-admin/includes/theme-install.php diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index ea96ef8b..31ce5f79 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -19,194 +19,106 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test 'tags' => true, 'num_ratings' => true ); - -/** - * Retrieve theme installer pages from WordPress Themes API. - * - * It is possible for a theme to override the Themes API result with three - * filters. Assume this is for themes, which can extend on the Theme Info to - * offer more choices. This is very powerful and must be used with care, when - * overridding the filters. - * - * The first filter, 'themes_api_args', is for the args and gives the action as - * the second parameter. The hook for 'themes_api_args' must ensure that an - * object is returned. - * - * The second filter, 'themes_api', is the result that would be returned. - * - * @since 2.8.0 - * - * @param string $action - * @param array|object $args Optional. Arguments to serialize for the Theme Info API. - * @return mixed - */ -function themes_api($action, $args = null) { - - if ( is_array($args) ) - $args = (object)$args; - - if ( !isset($args->per_page) ) - $args->per_page = 24; - - $args = apply_filters('themes_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter. - $res = apply_filters('themes_api', false, $action, $args); //NOTE: Allows a theme to completely override the builtin WordPress.org API. - - if ( ! $res ) { - $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) ); - if ( is_wp_error($request) ) { - $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.
Try again'), $request->get_error_message() ); - } else { - $res = unserialize($request['body']); - if ( ! $res ) - $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']); - } - } - //var_dump(array($args, $res)); - return apply_filters('themes_api_result', $res, $action, $args); -} - /** * Retrieve list of WordPress theme features (aka theme tags) * * @since 2.8.0 * + * @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.0', '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; } -add_action('install_themes_search', 'install_theme_search', 10, 1); -/** - * Display theme search results - * - * @since 2.8.0 - * - * @param string $page - */ -function install_theme_search($page) { - global $theme_field_defaults; - - $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; - - $args = array(); - - switch( $type ){ - case 'tag': - $terms = explode(',', $term); - $terms = array_map('trim', $terms); - $terms = array_map('sanitize_title_with_dashes', $terms); - $args['tag'] = $terms; - break; - case 'term': - $args['search'] = $term; - break; - case 'author': - $args['author'] = $term; - break; - } - - $args['page'] = $page; - $args['fields'] = $theme_field_defaults; - - if ( !empty( $_POST['features'] ) ) { - $terms = $_POST['features']; - $terms = array_map( 'trim', $terms ); - $terms = array_map( 'sanitize_title_with_dashes', $terms ); - $args['tag'] = $terms; - $_REQUEST['s'] = implode( ',', $terms ); - $_REQUEST['type'] = 'tag'; - } - - $api = themes_api('query_themes', $args); - - if ( is_wp_error($api) ) - wp_die($api); - - add_action('install_themes_table_header', 'install_theme_search_form'); - - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - /** * Display search form for searching themes. * * @since 2.8.0 + * + * @param bool $type_selector */ -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.' ) . '
'; ?> - - - - 'featured', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - if ( is_wp_error($api) ) - wp_die($api); - display_themes($api->themes, $api->info['page'], $api->info['pages']); +function install_themes_upload() { +?> + + + 'new', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - if ( is_wp_error($api) ) - wp_die($api); - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - -add_action('install_themes_updated', 'install_themes_updated', 10, 1); -/** - * Display recently updated themes. - * - * @since 2.8.0 + * @global WP_Theme_Install_List_Table $wp_list_table * - * @param string $page + * @param object $theme */ -function install_themes_updated($page = 1) { - global $theme_field_defaults; - $args = array('browse' => 'updated', 'page' => $page, 'fields' => $theme_field_defaults); - $api = themes_api('query_themes', $args); - display_themes($api->themes, $api->info['page'], $api->info['pages']); -} - -add_action('install_themes_upload', 'install_themes_upload', 10, 1); -function install_themes_upload($page = 1) { -?> - - - - 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') . ''; - $actions[] = '' . __('Preview') . ''; - $actions = apply_filters('theme_install_action_links', $actions, $theme); +function display_theme( $theme ) { + _deprecated_function( __FUNCTION__, '3.4.0' ); + global $wp_list_table; + if ( ! isset( $wp_list_table ) ) { + $wp_list_table = _get_list_table('WP_Theme_Install_List_Table'); } - - $actions = implode ( ' | ', $actions ); - ?> -'> - - - - - - - - - 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) - */ + $wp_list_table->prepare_items(); + $wp_list_table->single_row( $theme ); } /** @@ -361,188 +174,39 @@ function display_theme($theme, $actions = null, $show_details = true) { * * @since 2.8.0 * - * @param array $themes List of themes. - * @param string $page - * @param int $totalpages Number of pages. + * @global WP_Theme_Install_List_Table $wp_list_table */ -function display_themes($themes, $page = 1, $totalpages = 1) { - $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; - $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; - ?> -- - |
' . __('Error: This theme is currently not available. Please try again later.') . '
' . __('Warning: This theme has not been tested with your current version of WordPress.') . '
' . __('Warning: This theme has not been marked as compatible with your version of WordPress.') . '
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') ) : - ?> -