diff -r a4642baaf829 -r 4d4862461b8d web/wp-admin/includes/theme-install.php
--- a/web/wp-admin/includes/theme-install.php Tue Feb 02 14:45:47 2010 +0000
+++ b/web/wp-admin/includes/theme-install.php Tue Feb 02 15:44:16 2010 +0000
@@ -1,547 +1,547 @@
- array('href' => array(), 'title' => array(), 'target' => array()),
- 'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
- 'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
- 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
- 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
- 'img' => array('src' => array(), 'class' => array(), 'alt' => array())
-);
-
-$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
- 'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
- '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
- *
- * @return array
- */
-function install_themes_feature_list( ) {
- if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
- set_transient( 'wporg_theme_feature_list', array( ), 10800);
-
- if ( $cache )
- return $cache;
-
- $feature_list = themes_api( 'feature_list', array( ) );
- if ( is_wp_error( $feature_list ) )
- return $features;
-
- set_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
-
- 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
- */
-function install_theme_search_form() {
- $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
- $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
- ?>
-
-
-
-
-
-
- '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) {
-?>
-
-
-
- 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);
- }
-
- $actions = implode ( ' | ', $actions );
- ?>
-'>
-; ?>)
-
-
-
-
-
-
-
-
version, $themes_allowedtags) ?>
-
author, $themes_allowedtags) ?>
-last_updated) ) : ?>
-
last_updated)) ) ?>
-requires) ) : ?>
-
requires) ?>
-tested) ) : ?>
-
tested ?>
-downloaded) ) : ?>
-
downloaded), number_format_i18n($theme->downloaded)) ?>
-
-
-
-
- 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
"; ?>
-
-
- stripslashes( $_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 )
- $api->$key = wp_kses($api->$key, $themes_allowedtags);
-
- iframe_header( __('Theme Install') );
-
- if ( empty($api->download_link) ) {
- echo '' . __('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.') . '
-
 ?>)
-
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') ) :
- ?>
-
-
-
-
-
-
- array('href' => array(), 'title' => array(), 'target' => array()),
+ 'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
+ 'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
+ 'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
+ 'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
+ 'img' => array('src' => array(), 'class' => array(), 'alt' => array())
+);
+
+$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
+ 'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
+ '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
+ *
+ * @return array
+ */
+function install_themes_feature_list( ) {
+ if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
+ set_transient( 'wporg_theme_feature_list', array( ), 10800);
+
+ if ( $cache )
+ return $cache;
+
+ $feature_list = themes_api( 'feature_list', array( ) );
+ if ( is_wp_error( $feature_list ) )
+ return $features;
+
+ set_transient( 'wporg_theme_feature_list', $feature_list, 10800 );
+
+ 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
+ */
+function install_theme_search_form() {
+ $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
+ $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
+ ?>
+
+
+
+
+
+
+ '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) {
+?>
+
+
+
+ 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);
+ }
+
+ $actions = implode ( ' | ', $actions );
+ ?>
+'>
+
+
+
+
+
+
+
+
+
version, $themes_allowedtags) ?>
+
author, $themes_allowedtags) ?>
+last_updated) ) : ?>
+
last_updated)) ) ?>
+requires) ) : ?>
+
requires) ?>
+tested) ) : ?>
+
tested ?>
+downloaded) ) : ?>
+
downloaded), number_format_i18n($theme->downloaded)) ?>
+
+
+
+
+ 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
"; ?>
+
+
+ stripslashes( $_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 )
+ $api->$key = wp_kses($api->$key, $themes_allowedtags);
+
+ iframe_header( __('Theme Install') );
+
+ if ( empty($api->download_link) ) {
+ echo '' . __('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.') . '
+
+
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') ) :
+ ?>
+
+
+
+
+
+
+ ; ?>)