X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..5aa86a9053fb0fa15846bb60aac2fb8fdfff524a:/wp-admin/includes/theme-install.php diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index ea96ef8b..9171daba 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -19,57 +19,13 @@ $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( ) { @@ -88,59 +44,6 @@ function install_themes_feature_list( ) { 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. * @@ -152,19 +55,19 @@ function install_theme_search_form() { ?>

-
+ + - +

-
+

'; - $trans = array ('Colors' => __('Colors'), 'black' => __('Black'), 'blue' => __('Blue'), 'brown' => __('Brown'), - 'green' => __('Green'), 'orange' => __('Orange'), 'pink' => __('Pink'), 'purple' => __('Purple'), 'red' => __('Red'), - 'silver' => __('Silver'), 'tan' => __('Tan'), 'white' => __('White'), 'yellow' => __('Yellow'), 'dark' => __('Dark'), - 'light' => __('Light'), 'Columns' => __('Columns'), 'one-column' => __('One Column'), 'two-columns' => __('Two Columns'), - 'three-columns' => __('Three Columns'), 'four-columns' => __('Four Columns'), 'left-sidebar' => __('Left Sidebar'), - 'right-sidebar' => __('Right Sidebar'), 'Width' => __('Width'), 'fixed-width' => __('Fixed Width'), 'flexible-width' => __('Flexible Width'), - 'Features' => __('Features'), 'custom-colors' => __('Custom Colors'), 'custom-header' => __('Custom Header'), 'theme-options' => __('Theme Options'), - 'threaded-comments' => __('Threaded Comments'), 'sticky-post' => __('Sticky Post'), 'microformats' => __('Microformats'), - 'Subject' => __('Subject'), 'holiday' => __('Holiday'), 'photoblogging' => __('Photoblogging'), 'seasonal' => __('Seasonal'), - ); foreach ( (array) $feature_list as $feature_name => $features ) { - if ( isset($trans[$feature_name]) ) - $feature_name = $trans[$feature_name]; $feature_name = esc_html( $feature_name ); echo '
' . $feature_name . '
'; - echo '
    '; - foreach ( $features as $feature ) { - $feature_name = $feature; - if ( isset($trans[$feature]) ) - $feature_name = $trans[$feature]; + echo '
      '; + foreach ( $features as $feature => $feature_name ) { $feature_name = esc_html( $feature_name ); $feature = esc_attr($feature); ?> @@ -218,73 +106,24 @@ function install_themes_dashboard() {
      -

      + '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']); -} - -add_action('install_themes_new', 'install_themes_new', 10, 1); -/** - * Display new themes/ - * - * @since 2.8.0 - * - * @param string $page - */ -function install_themes_new($page = 1) { - global $theme_field_defaults; - $args = array('browse' => '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 - * - * @param string $page - */ -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) { ?>

      -
      + - +
      preview_url . '?TB_iframe=true&width=600&height=400'; if ( !is_array($actions) ) { $actions = array(); - $actions[] = 'slug . '&TB_iframe=true&tbWidth=500&tbHeight=385') . '" class="thickbox thickbox-preview onclick" title="' . esc_attr(sprintf(__('Install “%s”'), $name)) . '">' . __('Install') . ''; - $actions[] = '' . __('Preview') . ''; + if ( !is_network_admin() ) + $actions[] = '' . __('Preview') . ''; $actions = apply_filters('theme_install_action_links', $actions, $theme); } @@ -332,11 +172,11 @@ function display_theme($theme, $actions = null, $show_details = true) {
      -
      <?php _e('5 stars') ?>
      -
      <?php _e('4 stars') ?>
      -
      <?php _e('3 stars') ?>
      -
      <?php _e('2 stars') ?>
      -
      <?php _e('1 star') ?>
      +
      <?php esc_attr_e('5 stars') ?>
      +
      <?php esc_attr_e('4 stars') ?>
      +
      <?php esc_attr_e('3 stars') ?>
      +
      <?php esc_attr_e('2 stars') ?>
      +
      <?php esc_attr_e('1 star') ?>
      -
      -
      - add_query_arg('paged', '%#%', $url), - 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => $totalpages, - 'current' => $page - )); - - if ( $page_links ) - echo "\t\t
      $page_links
      "; - ?> -
      -
      - - - $cols ) { - ?> - - $theme_index ) { - $class = array('available-theme'); - if ( $row == 1 ) $class[] = 'top'; - if ( $col == 1 ) $class[] = 'left'; - if ( $row == $rows ) $class[] = 'bottom'; - if ( $col == 3 ) $class[] = 'right'; - ?> - - - - -
      - -
      $page_links
      "; ?>
      - +function display_themes() { + global $wp_list_table; -display(); } - -add_action('install_themes_pre_theme-information', 'install_theme_information'); +add_action('install_themes_search', 'display_themes'); +add_action('install_themes_featured', 'display_themes'); +add_action('install_themes_new', 'display_themes'); +add_action('install_themes_updated', 'display_themes'); /** * Display theme information in dialog box form. @@ -464,7 +237,7 @@ function install_theme_information() { iframe_header( __('Theme Install') ); if ( empty($api->download_link) ) { - echo '

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

      '; + echo '

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

      '; iframe_footer(); exit; } @@ -489,7 +262,7 @@ function install_theme_information() { } $themes = get_themes(); - foreach ( $themes as $this_theme ) { + foreach ( (array) $themes as $this_theme ) { if ( is_array($this_theme) && $this_theme['Stylesheet'] == $api->slug ) { if ( $this_theme['Version'] == $api->version ) { $type = 'latest_installed'; @@ -515,12 +288,12 @@ switch ( $type ) { default: case 'install': if ( current_user_can('install_themes') ) : - $buttons .= '' . __('Install Now') . ''; + $buttons .= '' . __('Install Now') . ''; endif; break; case 'update_available': if ( current_user_can('update_themes') ) : - $buttons .= '' . __('Install Update Now') . ''; + $buttons .= '' . __('Install Update Now') . ''; endif; break; case 'newer_installed': @@ -546,3 +319,5 @@ case 'latest_installed': iframe_footer(); exit; } +add_action('install_themes_pre_theme-information', 'install_theme_information'); +