Added Simple Pie RSS aggregator library

Added Friends aggregator (experimental)
Added category dropdown to edit links form.


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@619 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 39 insertions, 54 deletions

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 8455e80..91eb4cb 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -112,64 +112,49 @@ if (0 < $numcats) $numcats = number_format($numcats);
 
 <?php do_action('activity_box_end'); ?>
 </div>
-<?php
-$rss = @fetch_rss(get_site_option( 'dashboardfeed1' ));
-$title = get_site_option( 'dashboardfeed1name' );
-if( get_site_option( 'customizefeed1' ) == 1 ) {
-	if( get_option( 'dashboardfeed1' ) == 0 ) {
-		$rss = @fetch_rss(get_option( 'dashboardfeed1' ));
-		$title = get_option( 'dashboardfeed1name' );
-	}
-} 
-
-if( $rss == false ) {
-	$rss = @fetch_rss('http://wordpress.org/development/feed/');
-	$title = "WordPress Development Blog";
-}
-
-if ( isset($rss->items) && 0 != count($rss->items) ) {
-	print "<h3>$title</h3>";
-	$rss->items = array_slice($rss->items, 0, 3);
-	foreach ($rss->items as $item ) {
-?>
-<h4><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a> &#8212; <?php printf(__('%s ago'), human_time_diff(strtotime($item['pubdate'], time() ) ) ); ?></h4>
-<p><?php echo $item['description']; ?></p>
-<?php
-	}
-}
-?>
+<h3><?php _e('Welcome to WordPress MU'); ?></h3>
 
+<p><?php _e('Use these links to get started:'); ?></p>
 
-<?php
-$rss = @fetch_rss(get_site_option( 'dashboardfeed2' ));
-$title = get_site_option( 'dashboardfeed2name' );
-if( get_site_option( 'customizefeed2' ) == 1 ) {
-	if( get_option( 'dashboardfeed2' ) == 0 ) {
-		$rss = @fetch_rss(get_option( 'dashboardfeed2' ));
-		$title = get_option( 'dashboardfeed2name' );
-	}
-} 
-if( $rss == false ) {
-	$rss = @fetch_rss('http://wordpress.org/development/feed/');
-}
-
-if ( isset($rss->items) && 0 != count($rss->items) ) {
-?>
-<div id="planetnews">
-<h3><?php _e( $title ); ?> &raquo;</a></h3>
 <ul>
-<?php
-$rss->items = array_slice($rss->items, 0, 20);
-foreach ($rss->items as $item ) {
-?>
-<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
-<?php
-	}
-?>
+<li><a href="post-new.php"><?php _e('Write a post'); ?></a></li>
+<li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
+<li><a href="link-add.php"><?php _e('Add a bookmark to your blogroll'); ?></a></li>
+<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
 </ul>
-</div>
-<?php
-}
+	<p><?php _e("Below is the latest news from the official WordPress development blog, click on a title to read the full entry. If you need help with WordPress please see our <a href='http://codex.wordpress.org/'>great documentation</a> or if that doesn't help visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
+	<?php
+	$rss = @fetch_rss('http://wordpress.org/development/feed/');
+	if ( isset($rss->items) && 0 != count($rss->items) ) {
+		?>
+		<h3><?php _e('WordPress Development Blog'); ?></h3>
+		<?php
+		$rss->items = array_slice($rss->items, 0, 3);
+		foreach ($rss->items as $item ) {
+			?>
+			<h4><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a> &#8212; <?php printf(__('%s ago'), human_time_diff(strtotime($item['pubdate'], time() ) ) ); ?></h4>
+			<p><?php echo $item['description']; ?></p>
+			<?php
+		}
+	}
+	$rss = @fetch_rss('http://planet.wordpress.org/feed/');
+	if ( isset($rss->items) && 0 != count($rss->items) ) {
+		?>
+		<div id="planetnews">
+		<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
+		<ul>
+		<?php
+		$rss->items = array_slice($rss->items, 0, 20);
+		foreach ($rss->items as $item ) {
+			?>
+			<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
+			<?php
+		}
+		?>
+		</ul>
+		</div>
+		<?php
+	}
 ?>
 <div style="clear: both">&nbsp;
 <br clear="all" />