+
+ ; ?>)
+
+
+
+
+
+ $description
\n"; } } diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 349feb2e6a..67b0483991 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -458,4 +458,78 @@ function get_filesystem_method() { return apply_filters('filesystem_method', $method); } -?> \ No newline at end of file +function request_filesystem_credentials($form_post, $type = '', $error = false) { + $req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error); + if ( '' !== $req_cred ) + return $req_cred; + + if ( empty($type) ) + $type = get_filesystem_method(); + + if ( 'direct' == $type ) + return true; + + if( ! $credentials = get_option('ftp_credentials') ) + $credentials = array(); + // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option) + $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']); + $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']); + $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']); + $credentials['ssl'] = defined('FTP_SSL') ? FTP_SSL : ( isset($_POST['ssl']) ? $_POST['ssl'] : $credentials['ssl']); + + if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) { + $stored_credentials = $credentials; + unset($stored_credentials['password']); + update_option('ftp_credentials', $stored_credentials); + return $credentials; + } + $hostname = ''; + $username = ''; + $password = ''; + $ssl = ''; + if ( !empty($credentials) ) + extract($credentials, EXTR_OVERWRITE); + if( $error ) + echo '' . __('Error: There was an error connecting to the server, Please verify the settings are correct.') . '
$message
\n"; +} + ?> diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php new file mode 100644 index 0000000000..d80d89b117 --- /dev/null +++ b/wp-admin/includes/plugin-install.php @@ -0,0 +1,532 @@ + $action, 'request' => serialize($args))) );//Note: http_build_query() can be removed once WP_HTTP accepts unencoded data. + $res = unserialize($request['body']); + if ( ! $res ) + wp_die($request['body']); + } + + return apply_filters('plugins_api_result', $res); +} + +function install_popular_tags( $args = array() ) { + if ( ! $cache = get_option('wporg_popular_tags') ) + add_option('wporg_popular_tags', array(), '', 'no');///No autoload. + + if ( $cache && $cache->timeout + 3 * 60 * 60 > time() ) + return $cache->cached; + + $tags = plugins_api('hot_tags'); + + update_option('wporg_popular_tags', (object) array('timeout' => time(), 'cached' => $tags)); + + return $tags; +} + +add_action('install_plugins_search', 'install_search', 10, 1); +function install_search($page) { + $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : ''; + $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; + + if( ! empty($term) ){ + $args = array(); + + switch( $type ){ + case 'tag': + $args['tag'] = sanitize_title_with_dashes($term); + break; + case 'term': + $args['search'] = $term; + break; + case 'author': + $args['author'] = $term; + break; + } + + $args['page'] = $page; + + $api = plugins_api('query_plugins', $args); + + add_action('install_plugins_table_header', 'install_search_form'); + + display_plugins_table($api->plugins, $api->info['page'], $api->info['pages']); + + return; + } + ?> + +WordPress Plugin Directory via this page.') ?>
+ + + +
+ Term: Searches plugins names and descriptions for the specified term') ?>
+ Tag: Searches for plugins tagged as such') ?>
+ Author: Searches for plugins created by the Author, or which the Author contributed to.') ?>
Will utilise SwfUpload(if available) & unzip .zip plugin packages
'; +} + +function display_plugins_table($plugins, $page = 1, $totalpages = 1){ + global $tab; + + $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : ''; + $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; + + $plugins_allowedtags = array('a' => array('href' => array(),'title' => array(), 'target' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()); + +?> +| + | + | + | + | + | ', __('No plugins match your request.'), ' | '; + + foreach( (array) $plugins as $plugin ){ + if ( is_object($plugin) ) + $plugin = (array) $plugin; + + $title = wp_kses($plugin['name'], $plugins_allowedtags); + $description = wp_kses($plugin['description'], $plugins_allowedtags); + $version = wp_kses($plugin['version'], $plugins_allowedtags); + + $name = strip_tags($title . ' ' . $version); + + $author = $plugin['author']; + if( ! empty($plugin['author']) ) + $author = ' ' . sprintf( __('By %s'), $author ) . '.'; + + $author = wp_kses($author, $plugins_allowedtags); + + if( isset($plugin['homepage']) ) + $title = '' . $title . ''; + + $action_links = array(); + $action_links[] = '' . __('Install') . ''; + + $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin); + ?> +
|---|---|---|---|---|
| + | + |
+
+
+
+ |
+ + | + |
WordPress plugin directory.'); ?>
-%s directory. Once a plugin is uploaded, you may activate it here.'), WP_PLUGIN_DIR); ?>
+Plugin Browser/Installer functionality, Or by browsing the WordPress Plugin Directory directly and installing manually.'); ?>
+manually install a plugin you generally just need to upload the plugin file into your %s directory.'), WP_PLUGIN_DIR); ?>
' . __('Error: There was an error connecting to the server, Please verify the settings are correct.') . '
$message
\n"; -} - function do_plugin_upgrade($plugin) { global $wp_filesystem; diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 2c37e97738..5eb9a085b9 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -350,10 +350,16 @@ function wp_tag_cloud( $args = '' ) { if ( empty($tags) ) return; - $return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args + foreach ( $tags as $key => $tag ) { + $link = get_tag_link( $tag->term_id ); + if ( is_wp_error( $link ) ) + return false; - if ( is_wp_error( $return ) ) - return false; + $tags[ $key ]->link = $link; + $tags[ $key ]->id = $tag->term_id; + } + + $return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args $return = apply_filters( 'wp_tag_cloud', $return, $args ); @@ -363,28 +369,33 @@ function wp_tag_cloud( $args = '' ) { echo $return; } -// $tags = prefetched tag array ( get_tags() ) -// $args['format'] = 'flat' => whitespace separated, 'list' => UL, 'array' => array() -// $args['orderby'] = 'name', 'count' +/** + * Generates a tag cloud (heatmap) from provided data + * + * TODO: Complete + * + * @since 2.6 + * + * $tags = array of objects with the properties 'name', 'link', 'id', and 'count' + * $args['format'] = 'flat' => whitespace separated, 'list' => UL, 'array' => array() + * $args['orderby'] = 'name', 'count' +*/ function wp_generate_tag_cloud( $tags, $args = '' ) { global $wp_rewrite; $defaults = array( - 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45, - 'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC' + 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', + 'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC', + 'single_text' => '%d topic', 'multiple_text' => '%d topics' ); $args = wp_parse_args( $args, $defaults ); extract($args); - if ( !$tags ) + if ( empty($tags) ) return; - $counts = $tag_links = array(); - foreach ( (array) $tags as $tag ) { - $counts[$tag->name] = $tag->count; - $tag_links[$tag->name] = get_tag_link( $tag->term_id ); - if ( is_wp_error( $tag_links[$tag->name] ) ) - return $tag_links[$tag->name]; - $tag_ids[$tag->name] = $tag->term_id; - } + + $counts = array(); + foreach ( (array) $tags as $tag ) + $counts[ $tag->name ] = $tag->count; $min_count = min($counts); $spread = max($counts) - $min_count; @@ -416,9 +427,10 @@ function wp_generate_tag_cloud( $tags, $args = '' ) { $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? ' rel="tag"' : ''; foreach ( $counts as $tag => $count ) { - $tag_id = $tag_ids[$tag]; - $tag_link = clean_url($tag_links[$tag]); - $a[] = "$tag"; } diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 09863061f7..84ab78ea74 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1420,4 +1420,85 @@ function wp_html_excerpt( $str, $count ) { return $str; } +/** + * Add a Base url to relative links in passed content. + * + * By default it supports the 'src' and 'href' attributes, + * However this may be changed via the 3rd param. + * + * @package WordPress + * @since 2.7 + * + * @param string $content String to search for links in + * @param string $base The base URL to prefix to links + * @param array $attrs The attributes which should be processed. + * @eaturn string The processed content. + */ +function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) { + $attrs = implode('|', (array)$attrs); + return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", + create_function('$m', 'return _links_add_base($m, "' . $base . '");'), + $content); +} + +/** + * Callback to add a base url to relative links in passed content. + * + * + * @package WordPress + * @since 2.7 + * + * @internal + * @param string $m The matched link + * @param string $base The base URL to prefix to links + * @eaturn string The processed link + */ +function _links_add_base($m, $base) { + //1 = attribute name 2 = quotation mark 3 = URL + return $m[1] . '=' . $m[2] . + (strpos($m[3], 'http://') === false ? + path_join($base, $m[3]) : + $m[3]) + . $m[2]; +} + +/** + * Adds a Target attribute to all links in passed content. + * + * This function by default only applies to tags, + * however this can be modified by the 3rd param. + * NOTE: Any current target attributed will be striped and replaced. + * + * @package WordPress + * @since 2.7 + * + * @param string $content String to search for links in + * @param string $target The Target to add to the links + * @param array $tags An array of tags to apply to. + * @eaturn string The processed content. + */ +function links_add_target( $content, $target = '_blank', $tags = array('a') ) { + $tags = implode('|', (array)$tags); + return preg_replace_callback("!<($tags)(.+?)>!i", + create_function('$m', 'return _links_add_target($m, "' . $target . '");'), + $content); +} +/** + * Callback to add a target attribute to all links in passed content + * + * + * @package WordPress + * @since 2.7 + * + * @internal + * @param string $m The matched link + * @param string $target The Target to add to the links + * @eaturn string The processed link. + */ +function _links_add_target( $m, $target ) { + $tag = $m[1]; + $link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]); + return '<' . $tag . $link . ' target="' . $target . '">'; +} + ?> diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index fd461619ba..4caec11e6c 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -201,6 +201,12 @@ function wp_default_scripts( &$scripts ) { )); $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' ); + + $scripts->add( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20080803' ); + $scripts->localize( 'plugin-install', 'plugininstallL10n', array( + 'plugin_information' => __('Plugin Information:') + ) ); + } } @@ -234,6 +240,7 @@ function wp_default_styles( &$styles ) { $styles->add_data( 'press-this-ie', 'conditional', 'gte IE 6' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20080613' ); $styles->add( 'login', '/wp-admin/css/login.css' ); + $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css' ); foreach ( $rtl_styles as $rtl_style ) $styles->add_data( $rtl_style, 'rtl', true ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 721f5d96a7..223c085a50 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -15,6 +15,6 @@ $wp_version = '2.7-bleeding'; * * @global int $wp_db_version */ -$wp_db_version = 8370; +$wp_db_version = 8539; ?>