Removed rejected patched file

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

1 files changed, 0 insertions, 1224 deletions

diff --git a/wp-admin/wpmu-blogs.php.rej b/wp-admin/wpmu-blogs.php.rej
deleted file mode 100644
index c3aebfd..0000000
--- a/wp-admin/wpmu-blogs.php.rej
+++ /dev/null
@@ -1,1224 +0,0 @@
-***************
-*** 1,570 ****
-  <?php
-  require_once('admin.php');
-  
-- $title = __('WPMU Admin: Blogs');
-  $parent_file = 'wpmu-admin.php';
-  require_once('admin-header.php');
-  if( is_site_admin() == false ) {
--     die( __('<p>You do not have permission to access this page.</p>') );
-  }
-- if (isset($_GET['updated'])) {
-- 	?><div id="message" class="updated fade"><p><?php _e('Options saved.') ?></p></div><?php
-- }
-- print '<div class="wrap">';
-- switch( $_GET[ 'action' ] ) {
--     case "editblog":
-- 		$id = intval( $_GET[ 'id' ] );
-- 		$options_table_name = "$wpmuBaseTablePrefix{$id}_options";
-- 		$options = $wpdb->get_results( "SELECT * FROM {$options_table_name} WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A );
-- 		$details = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$id}'", ARRAY_A );
-- 		$editblog_roles = get_blog_option( $id, "$wpmuBaseTablePrefix{$id}_user_roles" );
-  
-- 		print "<h2>" . __('Edit Blog') . "</h2>";
-- 		print "<a href='http://{$details[ 'domain' ]}/'>{$details[ 'domain' ]}</a>";
--     ?>
--     <form name="form1" method="post" action="wpmu-edit.php?action=updateblog"> 
--     <?php wp_nonce_field( "editblog" ); ?>
--     <input type="hidden" name="id" value="<?php echo $id ?>" /> 
--     <table><td valign='top'>
--     <div class="wrap">
--     <table width="100%" border='0' cellspacing="2" cellpadding="5" class="editform"> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e('URL') ?></th> 
-- 	<td>http://<input name="blog[domain]" type="text" id="domain" value="<?php echo $details[ 'domain' ] ?>" size="33" /></td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e('Path') ?></th> 
-- 	<td><input name="blog[path]" type="text" id="path" value="<?php echo $details[ 'path' ] ?>" size="40" /></td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e('Registered') ?></th> 
-- 	<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo $details[ 'registered' ] ?>" size="40" /></td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e('Last Updated') ?></th> 
-- 	<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo $details[ 'last_updated' ] ?>" size="40" /></td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e('Public') ?></th> 
-- 	<td><input type='radio' name='blog[public]' value='1' <?php if( $details[ 'public' ] == '1' ) echo " checked"?>> <?php _e('Yes') ?>&nbsp;&nbsp;
-- 	    <input type='radio' name='blog[public]' value='0' <?php if( $details[ 'public' ] == '0' ) echo " checked"?>> <?php _e('No') ?> &nbsp;&nbsp;
-- 	    </td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e( 'Archived' ); ?></th> 
-- 	<td><input type='radio' name='blog[archived]' value='1' <?php if( $details[ 'archived' ] == '1' ) echo " checked"?>> <?php _e('Yes') ?>&nbsp;&nbsp;
-- 	    <input type='radio' name='blog[archived]' value='0' <?php if( $details[ 'archived' ] == '0' ) echo " checked"?>> <?php _e('No') ?> &nbsp;&nbsp;
-- 	    </td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e( 'Mature' ); ?></th> 
-- 	<td><input type='radio' name='blog[mature]' value='1' <?php if( $details[ 'mature' ] == '1' ) echo " checked"?>> <?php _e('Yes') ?>&nbsp;&nbsp;
-- 	    <input type='radio' name='blog[mature]' value='0' <?php if( $details[ 'mature' ] == '0' ) echo " checked"?>> <?php _e('No') ?> &nbsp;&nbsp;
-- 	    </td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e( 'Spam' ); ?></th> 
-- 	<td><input type='radio' name='blog[spam]' value='1' <?php if( $details[ 'spam' ] == '1' ) echo " checked"?>> <?php _e('Yes') ?>&nbsp;&nbsp;
-- 	    <input type='radio' name='blog[spam]' value='0' <?php if( $details[ 'spam' ] == '0' ) echo " checked"?>> <?php _e('No') ?> &nbsp;&nbsp;
-- 	    </td> 
-- 	</tr> 
-- 	<tr valign="top"> 
-- 	<th scope="row"><?php _e( 'Deleted' ); ?></th> 
-- 	<td><input type='radio' name='blog[deleted]' value='1' <?php if( $details[ 'deleted' ] == '1' ) echo " checked"?>> <?php _e('Yes') ?>&nbsp;&nbsp;
-- 	    <input type='radio' name='blog[deleted]' value='0' <?php if( $details[ 'deleted' ] == '0' ) echo " checked"?>> <?php _e('No') ?> &nbsp;&nbsp;
-- 	    </td> 
-- 	</tr> 
--     <tr><td colspan='2'>
--     <br />
--     <br />
--     </td></tr>
--     <?php
-- 	$editblog_default_role = 'subscriber';
-- 	while( list( $key, $val ) = each( $options ) ) { 
-- 		if( $val[ 'option_name' ] == 'default_role' )
-- 			$editblog_default_role = $val[ 'option_value' ];
-- 		$disabled = '';
-- 		if ( is_serialized($val[ 'option_value' ]) ) {
-- 			if ( is_serialized_string($val[ 'option_value' ]) ) {
-- 				$val[ 'option_value' ] = wp_specialchars(maybe_unserialize($val[ 'option_value' ]), 'single');
-- 			} else {
-- 				$val[ 'option_value' ] = "SERIALIZED DATA";
-- 				$disabled = ' disabled="disabled"';
-- 			}
-  		}
-- 		if ( stristr($val[ 'option_value' ], "\r") or stristr($val[ 'option_value' ], "\n") or stristr($val[ 'option_value' ], "\r\n") ) {
-  		?>
-- 		<tr valign="top"> 
-- 		<th scope="row"><?php echo ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) ?></th> 
-- 		<td><textarea rows="5" cols="40" name="option[<?php echo $val[ 'option_name' ] ?>]" type="text" id="<?php echo $val[ 'option_name' ] ?>"<?php echo $disabled ?>><?php echo wp_specialchars( stripslashes( $val[ 'option_value' ] ), 1 ) ?></textarea></td>
-- 		</tr>
-- 		<?php
-- 		} else {
-  		?>
-- 		<tr valign="top"> 
-- 		<th scope="row"><?php echo ucwords( str_replace( "_", " ", $val[ 'option_name' ] ) ) ?></th> 
-- 		<td><input name="option[<?php echo $val[ 'option_name' ] ?>]" type="text" id="<?php echo $val[ 'option_name' ] ?>" value="<?php echo wp_specialchars( stripslashes( $val[ 'option_value' ] ), 1 ) ?>" size="40" <?php echo $disabled ?>/></td> 
-- 		</tr> 
-  		<?php
-- 		}
--     }
--     ?>
--     </table>
--     <p class="submit">
--       <input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
--     </p>
--     </div>
--     </td>
--     <td valign='top'>
--     <?php
-- 	$themes = get_themes();
-- 	$blog_allowed_themes = wpmu_get_blog_allowedthemes( $id );
-- 	$allowed_themes = get_site_option( "allowedthemes" );
-- 	if( $allowed_themes == false ) {
-- 		$allowed_themes = array_keys( $themes );
-- 	}
-- 	$out = '';
-- 	foreach( $themes as $key => $theme ) {
-- 		$theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
-- 		if( isset( $allowed_themes[ $theme_key ] ) == false ) {
-- 			if( isset( $blog_allowed_themes[ $theme_key ] ) == true ) {
-- 				$checked = 'checked ';
-- 			} else {
-- 				$checked = '';
-- 			}
-- 
-- 			$out .= '
-- 			<tr valign="top"> 
-- 			<th title="' . htmlspecialchars( $theme[ "Description" ] ) . '" scope="row">'.$key.'</th> 
-- 			<td><input name="theme['.$theme_key.']" type="checkbox" id="'.$key.'" value="on" '.$checked.'/></td> 
-- 			</tr> ';
-- 		}
--     }
--     if( $out != '' ) {
-- 		print "<div class='wrap'><h3>" . __('Blog Themes') . "</h3>";
-- 		print '<table width="100%" border="0" cellspacing="2" cellpadding="5" class="editform">';
-- 		print '<tr><th>' . __('Theme') . '</th><th>' . __('Enable') . '</th></tr>';
-- 		print $out;
-- 		print "</table></div>";
-- 	}
--     $blogusers = get_users_of_blog( $id );
--     print '<div class="wrap"><h3>' . __('Blog Users') . '</h3>';
--     if( is_array( $blogusers ) ) {
-- 	    print '<table width="100%"><caption>' . __('Current Users') . '</caption>';
-- 	    print "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th><th></th></tr>";
-- 	    reset( $blogusers );
-- 	    while( list( $key, $val ) = each( $blogusers ) ) 
-- 	    { 
-- 		    $t = @unserialize( $val->meta_value );
-- 		    if( is_array( $t ) ) {
-- 			    reset( $t );
-- 			    $existing_role = key( $t );
-- 		    }
-- 		    print "<tr><td>" . $val->user_login . "</td>";
-- 		    if( $val->user_id != $current_user->data->ID ) {
-- 			    ?>
-- 			    <td><select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php 
-- 				    foreach( $editblog_roles as $role => $role_assoc ){
-- 					    $selected = '';
-- 					    if( $role == $existing_role )
-- 						    $selected = 'selected="selected"';
-- 					    echo "<option {$selected} value=\"{$role}\">{$role_assoc['name']}</option>";
-- 				    }
-- 			    ?></select></td><td><input type='text' name='user_password[<?php echo $val->user_id ?>]'></td><?php
-- 			    print '<td><input title="' . __('Click to remove user') . '" type="checkbox" name="blogusers[' . $val->user_id . ']"></td>';
-- 		    } else {
-- 			    print "<td><b>" . __ ('N/A') . "</b></td><td><b>" . __ ('N/A') . "</b></td><td><b>" . __('N/A') . "</b></td>";
-- 		    }
-- 		    print '<td><a href="user-edit.php?user_id=' . $val->user_id . '">' . __('Edit') . "</td></tr>";
-- 	    }
-- 	    print "</table>";
--     }
--     print "<h3>" . __('Add a new user') . "</h3>";
--     ?>
-- <p><?php _e('As you type WordPress will offer you a choice of usernames.<br /> Click them to select and hit <em>Update Options</em> to add the user.') ?></p>
-- <table>
-- <tr><th scope="row"><?php _e('User&nbsp;Login:') ?> </th><td><input type="text" name="newuser" id="newuser"></td></tr>
-- <tr><td></td><td></td> </tr>
-- 	<tr>
-- 		<th scope="row"><?php _e('Role:') ?></th>
-- 		<td><select name="new_role" id="new_role"><?php 
-- 		reset( $editblog_roles );
-- 		foreach( $editblog_roles as $role => $role_assoc ){
-- 			$selected = '';
-- 			if( $role == $editblog_default_role )
-- 				$selected = 'selected="selected"';
-- 			echo "<option {$selected} value=\"{$role}\">{$role_assoc['name']}</option>";
-- 		}
-- 		?></select></td>
-- 	</tr>
-- </table>
-- </div>
-- <div class='wrap'><strong><?php _e('Misc Blog Actions') ?></strong>
-- <p><?php do_action( "wpmueditblogaction", $_GET[ 'id' ] ); ?></p>
-- </div>
-- <p class="submit">
-- <input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" />
-- </p>
-- 
--     </td>
--     </table>
--     <?php
--     break;
--     default:
-- 		if( isset( $_GET[ 'start' ] ) == false ) {
-- 			$start = 0;
-- 		} else {
-- 			$start = intval( $_GET[ 'start' ] );
-- 		}
-- 		if( isset( $_GET[ 'num' ] ) == false ) {
-- 			$num = 60;
-- 		} else {
-- 			$num = intval( $_GET[ 'num' ] );
-- 		}
-- 
-- 		$query = "SELECT * 
-- 			FROM ".$wpdb->blogs." 
-- 			WHERE site_id = '".$wpdb->siteid."' ";
-- 		if( $_GET[ 's' ] != '' ) {
-  			$query = "SELECT blog_id, {$wpdb->blogs}.domain, {$wpdb->blogs}.path, registered, last_updated
-- 				FROM $wpdb->blogs, $wpdb->site 
-- 				WHERE site_id = '$wpdb->siteid'
-- 				AND   {$wpdb->blogs}.site_id = {$wpdb->site}.id
-- 				AND   ( {$wpdb->blogs}.domain LIKE '%". trim( $_GET[ 's' ] )."%' OR {$wpdb->blogs}.path LIKE '%". trim( $_GET[ 's' ] )."%' )";
-- 		} elseif( $_GET[ 'blog_id' ] != '' ) {
-  			$query = "SELECT * 
-- 				FROM $wpdb->blogs 
-- 				WHERE site_id = '$wpdb->siteid'
-- 				AND   blog_id = '".intval($_GET[ 'blog_id' ])."'";
-- 		} elseif( $_GET[ 'ip_address' ] != '' ) {
-- 			$query = "SELECT * 
-- 				FROM $wpdb->blogs, wp_registration_log
-- 				WHERE site_id = '$wpdb->siteid'
-- 				AND   {$wpdb->blogs}.blog_id = wp_registration_log.blog_id
-- 				AND   wp_registration_log.IP LIKE ('%".$_GET[ 'ip_address' ]."%')";
-  		}
-- 		if( isset( $_GET[ 'sortby' ] ) == false ) {
-- 			$_GET[ 'sortby' ] = 'id';
-  		}
-- 		if( $_GET[ 'sortby' ] == 'registered' ) {
-  			$query .= ' ORDER BY registered ';
-- 		} elseif( $_GET[ 'sortby' ] == 'id' ) {
-  			$query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
-- 		} elseif( $_GET[ 'sortby' ] == 'lastupdated' ) {
-  			$query .= ' ORDER BY last_updated ';
-- 		} elseif( $_GET[ 'sortby' ] == 'blogname' ) {
-  			$query .= ' ORDER BY domain ';
-  		}
-- 		if( $_GET[ 'order' ] == 'DESC' ) {
-- 			$query .= "DESC";
-- 		} else {
-- 			$query .= "ASC";
-  		}
-  
-- 		if ( $_GET[ 'ip_address' ] == '' )
-- 			$query .= " LIMIT " . intval( $start ) . ", " . intval( $num );
-- 		$blog_list = $wpdb->get_results( $query, ARRAY_A );
-- 		if( count( $blog_list ) < $num ) {
-- 			$next = false;
-  		} else {
-- 			$next = true;
-  		}
-- ?>
-- <script language="javascript">
-- <!--
-- var checkflag = "false";
-- function check_all_rows() {
-- 	field = document.formlist;
-- 	if (checkflag == "false") {
-- 		for (i = 0; i < field.length; i++) {
-- 			if( field[i].name == 'allblogs[]' )
-- 				field[i].checked = true;}
-- 		checkflag = "true";
-- 		return "<?php _e('Uncheck All') ?>"; 
-- 	} else {
-- 		for (i = 0; i < field.length; i++) {
-- 			if( field[i].name == 'allblogs[]' )
-- 				field[i].checked = false; }
-- 		checkflag = "false";
-- 		return "<?php _e('Check All') ?>"; 
-- 	}
-- }
-  
-- //  -->
-- </script>
-  
-- <h2><?php _e('Blogs') ?></h2>
-- <form name="searchform" action="wpmu-blogs.php" method="get" style="float: left; margin-right: 3em;"> 
--   <table><td>
--   <fieldset> 
--   <legend><?php _e('Search Blogs&hellip;') ?></legend> 
--   <input type='hidden' name='action' value='blogs'>
--   <?php _e('Name:') ?>&nbsp;<input type="text" name="s" value="<?php if (isset($_GET[ 's' ])) echo wp_specialchars($_GET[ 's' ], 1); ?>" size="17" /><br />
--   <?php _e('Blog&nbsp;ID:') ?>&nbsp;<input type="text" name="blog_id" value="<?php if (isset($_GET[ 'blog_id' ])) echo wp_specialchars($_GET[ 'blog_id' ], 1); ?>" size="10" /><br />
--   <?php _e('IP Address:') ?> <input type="text" name="ip_address" value="<?php if (isset($_GET[ 'ip_address' ])) echo wp_specialchars($_GET[ 'ip_address' ], 1); ?>" size="10" /><br />
--   <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
--   </fieldset>
--   <?php
--   if( isset($_GET[ 's' ]) && $_GET[ 's' ] != '' ) {
-- 	  ?><a href="/wp-admin/wpmu-users.php?action=users&s=<?php echo wp_specialchars($_GET[ 's' ], 1) ?>"><?php _e('Search Users:') ?> <?php echo wp_specialchars($_GET[ 's' ], 1) ?></a><?php
--   }
--   ?>
--   </td><td valign='top'>
--   <fieldset> 
--   <legend><?php _e('Blog Navigation') ?></legend> 
--   <?php 
-  
--   $url2 = "order=" . $_GET[ 'order' ] . "&sortby=" . $_GET[ 'sortby' ] . "&s=" . $_GET[ 's' ] . "&ip_address=" . $_GET[ 'ip_address' ];
-  
--   $blog_navigation = '';
--   if( $start == 0 ) { 
-- 	  $blog_navigation .= __('Previous&nbsp;Blogs');
--   } elseif( $start <= 30 ) { 
-- 	  $blog_navigation .= '<a href="wpmu-blogs.php?start=0&' . $url2 . ' ">' . __('Previous&nbsp;Blogs') . '</a>';
--   } else {
-- 	  $blog_navigation .= '<a href="wpmu-blogs.php?start=' . ( $start - $num ) . '&' . $url2 . '">' . __('Previous&nbsp;Blogs') . '</a>';
--   } 
--   if ( $next ) {
-- 	  $blog_navigation .= '&nbsp;||&nbsp;<a href="wpmu-blogs.php?start=' . ( $start + $num ) . '&' . $url2 . '">' . __('Next&nbsp;Blogs') . '</a>';
--   } else {
-- 	  $blog_navigation .= '&nbsp;||&nbsp;' . __('Next&nbsp;Blogs');
--   }
--   echo $blog_navigation;
--   ?>
--   </fieldset>
--   </td></table>
-- </form>
-  
-- <br style="clear:both;" />
-  
-- <?php
-  
-- // define the columns to display, the syntax is 'internal name' => 'display name'
-- $posts_columns = array(
--   'id'           => __('ID'),
--   'blogname'     => __('Blog Name'),
--   'lastupdated'  => __('Last Updated'),
--   'registered'   => __('Registered'),
--   'users'        => __('Users'),
--   'plugins'      => __('Actions')
-- );
-- $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
-  
-- // you can not edit these at the moment
-- $posts_columns['control_view']      = '';
-- $posts_columns['control_edit']      = '';
-- $posts_columns['control_backend']   = '';
-- $posts_columns['control_deactivate'] = '';
-- $posts_columns['control_archive']    = '';
-- $posts_columns['control_spam']    = '';
-- $posts_columns['control_delete']    = '';
-  
-- $sortby_url = "s=" . $_GET[ 's' ] . "&ip_address=" . $_GET[ 'ip_address' ];
-- ?>
-  
-- <form name='formlist' action='wpmu-edit.php?action=allblogs' method='POST'>
-- <input type=button value="<?php _e('Check All') ?>" onClick="this.value=check_all_rows()"> 
-- <table width="100%" cellpadding="3" cellspacing="3"> 
-- 	<tr>
-  
-- <?php foreach($posts_columns as $column_id => $column_display_name) { ?>
-- 	<th scope="col"><a href="wpmu-blogs.php?<?php echo $sortby_url ?>&sortby=<?php echo $column_id ?>&<?php if( $_GET[ 'sortby' ] == $column_id ) { if( $_GET[ 'order' ] == 'DESC' ) { echo "order=ASC&" ; } else { echo "order=DESC&"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th>
-- <?php } ?>
-  
-- 	</tr>
-- <?php
-- if ($blog_list) {
-- 	$bgcolor = '';
-- 	$status_list = array( "archived" => "#fee", "spam" => "#faa", "deleted" => "#f55" );
-- 	foreach ($blog_list as $blog) { 
-- 		$class = ('alternate' == $class) ? '' : 'alternate';
-- 		reset( $status_list );
-- 		$bgcolour = "";
-- 		while( list( $status, $col ) = each( $status_list ) ) {
-- 			if( get_blog_status( $blog[ 'blog_id' ], $status ) == 1 ) {
-- 				$bgcolour = "style='background: $col'";
-- 			}
-- 		}
-- 		print "<tr $bgcolour class='$class'>";
-- 		if( constant( "VHOST" ) == 'yes' ) { 
-- 			$blogname = str_replace( '.' . $current_site->domain, '', $blog[ 'domain' ] ); 
-- 		} else { 
-- 			$blogname = $blog[ 'path' ]; 
-- 		}
-  
-- foreach($posts_columns as $column_name=>$column_display_name) {
-  
-- 	switch($column_name) {
-- 	
-- 	case 'id':
-- 		?>
-- 		<th scope="row"><input type='checkbox' id='<?php echo $blog[ 'blog_id' ] ?>' name='allblogs[]' value='<?php echo $blog[ 'blog_id' ] ?>'> <label for='<?php echo $blog[ 'blog_id' ] ?>'><?php echo $blog[ 'blog_id' ] ?></label></th>
-- 		<?php
-- 		break;
-  
-- 	case 'blogname':
-- 		?>
-- 		<td valign='top'><label for='<?php echo $blog[ 'blog_id' ] ?>'><?php echo $blogname ?></label>
-- 		</td>
-- 		<?php
-- 		break;
-  
-- 	case 'lastupdated':
-- 		?>
-- 		<td valign='top'><?php echo $blog[ 'last_updated' ] == '0000-00-00 00:00:00' ? __("Never") : $blog[ 'last_updated' ] ?></td>
-- 		<?php
-- 		break;
-  
-- 	case 'registered':
-- 		?>
-- 		<td valign='top'><?php echo $blog[ 'registered' ] ?></td>
-- 		<?php
-- 		break;
-- 
-- 	case 'users':
-- 		?>
-- 		<td valign='top'><?php 
-- 		$blogusers = get_users_of_blog( $blog[ 'blog_id' ] ); 
-- 		if( is_array( $blogusers ) ) {
-- 			if( $blog[ 'blog_id' ] == 1 && count( $blogusers ) > 10 )
-- 				$blogusers = array_slice( $blogusers, 0, 10 );
-- 			while( list( $key, $val ) = each( $blogusers ) ) 
-- 				print '<a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a> ('.$val->user_email.')<BR>'; 
-- 		}
-- 		?></td>
-- 		<?php
-- 		break;
-- 
-- 	case 'control_view':
-- 		?>
-- 		<td valign='top'><a href="http://<?php echo $blog[ 'domain' ]. $blog[ 'path' ]; ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
-- 		<?php
-- 		break;
-- 
-- 	case 'control_edit':
-- 		?>
-- 		<td valign='top'><?php echo "<a href='wpmu-blogs.php?action=editblog&amp;id=".$blog[ 'blog_id' ]."' class='edit'>" . __('Edit') . "</a>"; ?></td>
-- 		<?php
-- 		break;
-- 
-- 	case 'control_backend':
-- 		?>
-- 		<td valign='top'><?php echo "<a href='http://" . $blog[ 'domain' ] . $blog[ 'path' ] . "wp-admin/' class='edit'>" . __('Backend') . "</a>"; ?></td>
-- 		<?php
-- 		break;
-- 
-- 	case 'control_spam':
-- 		if( get_blog_status( $blog[ 'blog_id' ], "spam" ) == '1' ) {
-- 			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=unspamblog&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) ?>"><?php _e("Not Spam") ?></a></td>
-  			<?php
-- 		} else {
-  			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=spamblog&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) ?>"><?php _e("Spam") ?></a></td>
-- 			<?php
-- 		}
-- 		break;
-  
-- 	case 'control_deactivate':
-- 		if( get_blog_status( $blog[ 'blog_id' ], "deleted" ) == '1' ) {
-- 			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=activateblog&ref=<?php echo urlencode( $_SERVER[ 'REQUEST_URI' ] ) ?>&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) ?>"><?php _e("Activate") ?></a></td>
-- 			<?php
-- 		} else {
-- 			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=deactivateblog&ref=<?php echo urlencode( $_SERVER[ 'REQUEST_URI' ] ) ?>&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) ?>"><?php _e("Deactivate") ?></a></td>
-- 			<?php
-- 		}
-- 		break;
-- 
-- 	case 'control_archive':
-- 		if( get_blog_status( $blog[ 'blog_id' ], "archived" ) == '1' ) {
-- 			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=unarchiveblog&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) ?>"><?php _e("Unarchive") ?></a></td>
-- 			<?php
-- 		} else {
-- 			?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=archiveblog&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) ?>"><?php _e("Archive") ?></a></td>
-- 			<?php
-- 		}
-- 		break;
-- 
-- 	case 'control_delete':
-- 		?>
-- 			<td valign='top'><a class='edit' href="wpmu-edit.php?action=confirm&action2=deleteblog&id=<?php echo $blog[ 'blog_id' ] ?>&msg=<?php echo urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) ?>"><?php _e("Delete") ?></a></td>
-  		<?php
-- 		break;
-- 
-- 	case 'plugins':
-- 		?>
-- 		<td valign='top'><?php do_action( "wpmublogsaction", $blog[ 'blog_id' ] ); ?></td>
-- 		<?php
-- 		break;
-- 
-- 	default:
-- 		?>
-- 		<td valign='top'><?php do_action('manage_blogs_custom_column', $column_name, $id); ?></td>
-- 		<?php
-- 		break;
-- 	}
-- }
-- ?>
-- 	</tr>
-- <?php
-- }
-- } else {
-- ?>
--   <tr style='background-color: <?php echo $bgcolor; ?>'> 
--     <td colspan="8"><?php _e('No blogs found.') ?></td> 
--   </tr> 
-- <?php
-- } // end if ($blogs)
-- ?>
-- </table>
-- <table width='100%'>
-- <tr><td width='20%'>
-- <input type=button value="<?php _e('Check All') ?>" onClick="this.value=check_all_rows()"> 
-- <p><?php _e('Selected Blogs:') ?><ul>
-- <li><input type='radio' name='blogfunction' id='delete' value='delete'> <label for='delete'><?php _e('Delete') ?></label></li>
-- <li><input type='radio' name='blogfunction' id='spam' value='spam'> <label for='spam'><?php _e('Mark as Spam') ?></label></li>
-- <?php wp_nonce_field( "allblogs" ); ?>
-- </ul>
-- <input type='hidden' name='redirect' value='<?php echo $_SERVER[ 'REQUEST_URI' ] ?>'>
-- <input type='submit' value='<?php _e('Apply Changes') ?>'></p>
-- </form>
-- </td><td>
-- <fieldset> 
-- <legend><?php _e('Blog Navigation') ?></legend> 
-- <?php 
-- echo $blog_navigation;
-- ?>
-- </fieldset>
-- </td></tr>
-- </table>
-- </div>
-- <div class="wrap">
-- <h2><?php _e('Add Blog') ?></h2>
-- <form name="addform" method="post" action="wpmu-edit.php?action=addblog">
-- <?php wp_nonce_field('add-blog') ?>
-- <table>
-- <tr><th scope='row'><?php _e('Blog Address') ?></th><td><?php
-- if( constant( "VHOST" ) == 'yes' ) {
-- 	?><input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?></td></tr><?php
-- } else {
-- 	echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/></td></tr><?php
-- } ?>
-- <tr><th scope='row'><?php _e('Blog Title') ?></th><td><input name="blog[title]" type="text" title="<?php _e('Title') ?>"/></td></tr>
-- <tr><th scope='row'><?php _e('Admin Email') ?></th><td><input name="blog[email]" type="text" title="<?php _e('Email') ?>"/></td></tr>
-- <tr><td colspan='2'><?php _e('A new user will be created if the above email address is not in the database.') ?></td></tr>
-- </table>
-- <input type="submit" name="go" value="<?php _e('Add Blog') ?>" />
-- </form>
-- </div>
-- <?php
-- 
-- break;
-  } // end switch( $action )
-- ?> 
-  
-- </div>
-- <?php include('admin-footer.php'); ?>
---- 1,651 ----
-  <?php
-  require_once('admin.php');
-  
-+ $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
-  $parent_file = 'wpmu-admin.php';
-+ wp_enqueue_script( 'listman' );
-  require_once('admin-header.php');
-+ 
-  if( is_site_admin() == false ) {
-+ 	wp_die( __('<p>You do not have permission to access this page.</p>') );
-  }
-  
-+ $id = intval( $_GET['id'] );
-+ 
-+ if ( $_GET['updated'] == 'true' ) {
-+ 	?>
-+ 	<div id="message" class="updated fade"><p>
-+ 		<?php
-+ 		switch ($_GET['action']) {
-+ 			case 'all_spam':
-+ 				_e('Blogs mark as spam !');
-+ 			break;
-+ 			case 'all_delete':
-+ 				_e('Blogs deleted !');
-+ 			break;
-+ 			case 'delete':
-+ 				_e('Blog deleted !');
-+ 			break;
-+ 			case 'add-blog':
-+ 				_e('Blog added !');
-+ 			break;
-+ 			case 'archive':
-+ 				_e('Blog archived !');
-+ 			break;
-+ 			case 'unarchive':
-+ 				_e('Blog unarchived !');
-+ 			break;
-+ 			case 'activate':
-+ 				_e('Blog activated !');
-+ 			break;
-+ 			case 'deactivate':
-+ 				_e('Blog deactivated !');
-+ 			break;
-+ 			case 'unspam':
-+ 				_e('Blog mark as not spam !');
-+ 			break;
-+ 			case 'spam':
-+ 				_e('Blog mark as spam !');
-+ 			break;
-+ 			case 'umature':
-+ 				_e('Blog mark as not mature !');
-+ 			break;
-+ 			case 'mature':
-+ 				_e('Blog mark as mature !');
-+ 			break;
-+ 			default:
-+ 				_e('Options saved !');
-+ 			break;
-  		}
-  		?>
-+ 	</p></div>
-+ 	<?php
-+ }
-+ 
-+ switch( $_GET['action'] ) {
-+ 	// Edit blog
-+ 	case "editblog":
-+ 		$options = $wpdb->get_results( "SELECT * FROM {$wpmuBaseTablePrefix}{$id}_options WHERE option_name NOT LIKE 'rss%' AND option_name NOT LIKE '%user_roles'", ARRAY_A );
-+ 		$details = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$id}'", ARRAY_A );
-+ 		$editblog_roles = get_blog_option( $id, "{$wpmuBaseTablePrefix}{$id}_user_roles" );
-  		?>
-+ 		<div class="wrap">
-+ 		<h2><?php _e('Edit Blog'); ?></h2>
-+ 		<a href='http://<?php echo $details['domain'].$details['path']; ?>'><?php echo $details['domain'].$details['path']; ?></a>
-+ 		<form method="post" action="wpmu-edit.php?action=updateblog"> 
-+ 			<?php wp_nonce_field('editblog'); ?>
-+ 			<input type="hidden" name="id" value="<?php echo $id ?>" /> 
-+ 			<table>
-+ 			<tr>
-+ 				<td valign="top">
-+ 					<div class="wrap">
-+ 						<table style="border:0; width:100%;" cellspacing="2" cellpadding="5" class="editform"> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e('URL') ?></th> 
-+ 								<td>http://<input name="blog[domain]" type="text" id="domain" value="<?php echo $details['domain'] ?>" size="33" /></td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e('Path') ?></th> 
-+ 								<td><input name="blog[path]" type="text" id="path" value="<?php echo $details['path'] ?>" size="40" /></td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e('Registered') ?></th> 
-+ 								<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo $details['registered'] ?>" size="40" /></td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e('Last Updated') ?></th> 
-+ 								<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo $details['last_updated'] ?>" size="40" /></td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e('Public') ?></th> 
-+ 								<td>
-+ 									<input type='radio' name='blog[public]' value='1' <?php if( $details['public'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
-+ 									<input type='radio' name='blog[public]' value='0' <?php if( $details['public'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-+ 								</td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e( 'Archived' ); ?></th> 
-+ 								<td>
-+ 									<input type='radio' name='blog[archived]' value='1' <?php if( $details['archived'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
-+ 									<input type='radio' name='blog[archived]' value='0' <?php if( $details['archived'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-+ 								</td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e( 'Mature' ); ?></th> 
-+ 								<td>
-+ 									<input type='radio' name='blog[mature]' value='1' <?php if( $details['mature'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
-+ 									<input type='radio' name='blog[mature]' value='0' <?php if( $details['mature'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-+ 								</td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e( 'Spam' ); ?></th> 
-+ 								<td>
-+ 									<input type='radio' name='blog[spam]' value='1' <?php if( $details['spam'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
-+ 									<input type='radio' name='blog[spam]' value='0' <?php if( $details['spam'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-+ 								</td> 
-+ 							</tr> 
-+ 							<tr valign="top"> 
-+ 								<th scope="row"><?php _e( 'Deleted' ); ?></th> 
-+ 								<td>
-+ 									<input type='radio' name='blog[deleted]' value='1' <?php if( $details['deleted'] == '1' ) echo 'checked="checked"'; ?> /> <?php _e('Yes') ?>
-+ 									<input type='radio' name='blog[deleted]' value='0' <?php if( $details['deleted'] == '0' ) echo 'checked="checked"'; ?> /> <?php _e('No') ?>
-+ 								</td> 
-+ 							</tr> 
-+ 							<tr>
-+ 								<td colspan="2"><br /><br /></td>
-+ 							</tr>
-+ 							<?php
-+ 							$editblog_default_role = 'subscriber';
-+ 							foreach ( $options as $key => $val ) {
-+ 								if( $val['option_name'] == 'default_role' ) {
-+ 									$editblog_default_role = $val['option_value'];
-+ 								}
-+ 								$disabled = '';
-+ 								if ( is_serialized($val['option_value']) ) {
-+ 									if ( is_serialized_string($val['option_value']) ) {
-+ 										$val['option_value'] = wp_specialchars(maybe_unserialize($val['option_value']), 'single');
-+ 									} else {
-+ 										$val['option_value'] = "SERIALIZED DATA";
-+ 										$disabled = ' disabled="disabled"';
-+ 									}
-+ 								}
-+ 								if ( stristr($val['option_value'], "\r") || stristr($val['option_value'], "\n") || stristr($val['option_value'], "\r\n") ) {
-+ 								?>
-+ 									<tr valign="top"> 
-+ 										<th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th> 
-+ 										<td><textarea rows="5" cols="40" name="option[<?php echo $val['option_name'] ?>]" type="text" id="<?php echo $val['option_name'] ?>"<?php echo $disabled ?>><?php echo wp_specialchars( stripslashes( $val['option_value'] ), 1 ) ?></textarea></td>
-+ 									</tr>
-+ 								<?php
-+ 								} else {
-+ 								?>
-+ 									<tr valign="top"> 
-+ 										<th scope="row"><?php echo ucwords( str_replace( "_", " ", $val['option_name'] ) ) ?></th> 
-+ 										<td><input name="option[<?php echo $val['option_name'] ?>]" type="text" id="<?php echo $val['option_name'] ?>" value="<?php echo wp_specialchars( stripslashes( $val['option_value'] ), 1 ) ?>" size="40" <?php echo $disabled ?> /></td> 
-+ 									</tr> 
-+ 								<?php
-+ 								}
-+ 							} // End foreach
-+ 							?>
-+ 						</table>
-+ 						<p class="submit">
-+ 						<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
-+ 					</div>
-+ 				</td>
-+ 				<td valign="top">
-+ 					<?php
-+ 					// Blog Themes
-+ 					$themes = get_themes();
-+ 					$blog_allowed_themes = wpmu_get_blog_allowedthemes( $id );
-+ 					$allowed_themes = get_site_option( "allowedthemes" );
-+ 					if( $allowed_themes == false ) {
-+ 						$allowed_themes = array_keys( $themes );
-+ 					}
-+ 					$out = '';
-+ 					foreach( $themes as $key => $theme ) {
-+ 						$theme_key = wp_specialchars( $theme['Stylesheet'] );
-+ 						if( isset($allowed_themes[$theme_key] ) == false ) {
-+ 							$checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';							
-+ 							$out .= '<tr valign="top"> 
-+ 									<th title="'.htmlspecialchars( $theme["Description"] ).'" scope="row">'.$key.'</th> 
-+ 									<td><input name="theme['.$theme_key.']" type="checkbox" value="on" '.$checked.'/></td> 
-+ 								</tr>';
-+ 						}
-+ 					}
-+ 					
-+ 					if( $out != '' ) {
-+ 						echo "<div class='wrap'><h3>" . __('Blog Themes') . "</h3>";
-+ 						echo '<table width="100%" border="0" cellspacing="2" cellpadding="5" class="editform">';
-+ 						echo '<tr><th>' . __('Theme') . '</th><th>' . __('Enable') . '</th></tr>';
-+ 						echo $out;
-+ 						echo "</table></div>";
-+ 					}
-+ 					
-+ 					// Blog users
-+ 					$blogusers = get_users_of_blog( $id );
-+ 					echo '<div class="wrap"><h3>' . __('Blog Users') . '</h3>';
-+ 					if( is_array( $blogusers ) ) {
-+ 						echo '<table width="100%"><caption>' . __('Current Users') . '</caption>';
-+ 						echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th><th></th></tr>";
-+ 						reset($blogusers);
-+ 						foreach ( (array) $blogusers as $key => $val ) {
-+ 							$t = @unserialize( $val->meta_value );
-+ 							if( is_array( $t ) ) {
-+ 								reset( $t );
-+ 								$existing_role = key( $t );
-+ 							}
-+ 							echo "<tr><td>" . $val->user_login . "</td>";
-+ 							if( $val->user_id != $current_user->data->ID ) {
-+ 								?>
-+ 								<td>
-+ 									<select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php 
-+ 										foreach( $editblog_roles as $role => $role_assoc ){
-+ 											$selected = ( $role == $existing_role ) ? 'selected="selected"' : '';
-+ 											echo "<option {$selected} value=\"{$role}\">{$role_assoc['name']}</option>";
-+ 										}
-+ 										?>
-+ 									</select>
-+ 								</td>
-+ 								<td>
-+ 										<input type='text' name='user_password[<?php echo $val->user_id ?>]' />
-+ 								</td>
-+ 								<?php
-+ 								echo '<td><input title="' . __('Click to remove user') . '" type="checkbox" name="blogusers[' . $val->user_id . ']" /></td>';
-+ 							} else {
-+ 								echo "<td><strong>" . __ ('N/A') . "</strong></td><td><strong>" . __ ('N/A') . "</strong></td><td><strong>" . __('N/A') . "</strong></td>";
-+ 							}
-+ 							echo '<td><a href="user-edit.php?user_id=' . $val->user_id . '">' . __('Edit') . "</a></td></tr>";
-+ 						}
-+ 						echo "</table>";
-+ 					}
-+ 					
-+ 					// New blog user
-+ 					echo "<h3>" . __('Add a new user') . "</h3>";
-+ 					?>
-+ 					<p><?php _e('As you type WordPress will offer you a choice of usernames.<br /> Click them to select and hit <em>Update Options</em> to add the user.') ?></p>
-+ 					<table>
-+ 						<tr>
-+ 							<th scope="row"><?php _e('User&nbsp;Login:') ?></th>
-+ 							<td><input type="text" name="newuser" id="newuser" /></td>
-+ 						</tr>
-+ 						<tr>
-+ 							<th scope="row"><?php _e('Role:') ?></th>
-+ 							<td>
-+ 								<select name="new_role" id="new_role">
-+ 								<?php 
-+ 								reset( $editblog_roles );
-+ 								foreach( $editblog_roles as $role => $role_assoc ){
-+ 									$selected = ( $role == $editblog_default_role ) ? 'selected="selected"' : '';
-+ 									echo "<option {$selected} value=\"{$role}\">{$role_assoc['name']}</option>";
-+ 								}
-+ 								?>
-+ 								</select>
-+ 							</td>
-+ 						</tr>
-+ 					</table>
-+ 					</div>
-+ 					
-+ 					<div class="wrap">
-+ 						<strong><?php _e('Misc Blog Actions') ?></strong>
-+ 						<p><?php do_action( 'wpmueditblogaction', $id ); ?></p>
-+ 					</div>
-+ 					
-+ 					<p class="submit">
-+ 						<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>				
-+ 				</td>
-+ 			</tr>
-+ 			</table>
-+ 		</form>
-+ 		</div>
-  		<?php
-+ 	break;
-+ 	
-+ 	// List blogs
-+ 	default:
-+ 		$start = isset( $_GET['start'] ) ? intval( $_GET['start'] ) : 0;
-+ 		$num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 60;
-+ 		
-+ 		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
-+ 		
-+ 		if( !empty($_GET['s']) ) {
-+ 			$s = trim($_GET['s']);
-  			$query = "SELECT blog_id, {$wpdb->blogs}.domain, {$wpdb->blogs}.path, registered, last_updated
-+ 				FROM {$wpdb->blogs}, {$wpdb->site}
-+ 				WHERE site_id = '{$wpdb->siteid}'
-+ 				AND {$wpdb->blogs}.site_id = {$wpdb->site}.id
-+ 				AND ( {$wpdb->blogs}.domain LIKE '%{$s}%' OR {$wpdb->blogs}.path LIKE '%{$s}%' )";
-+ 		} elseif( !empty($_GET['blog_id']) ) {
-  			$query = "SELECT * 
-+ 				FROM {$wpdb->blogs}
-+ 				WHERE site_id = '{$wpdb->siteid}'
-+ 				AND   blog_id = '".intval($_GET['blog_id'])."'";
-+ 		} elseif( !empty($_GET['ip_address']) ) {
-+ 			$query = "SELECT *
-+ 				FROM {$wpdb->blogs}, {$wpdb->registration_log}
-+ 				WHERE site_id = '{$wpdb->siteid}'
-+ 				AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
-+ 				AND {$wpdb->registration_log}.IP LIKE ('%".$_GET['ip_address']."%')";
-  		}
-+ 		
-+ 		if( isset( $_GET['sortby'] ) == false ) {
-+ 			$_GET['sortby'] = 'id';
-  		}
-+ 		
-+ 		if( $_GET['sortby'] == 'registered' ) {
-  			$query .= ' ORDER BY registered ';
-+ 		} elseif( $_GET['sortby'] == 'id' ) {
-  			$query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
-+ 		} elseif( $_GET['sortby'] == 'lastupdated' ) {
-  			$query .= ' ORDER BY last_updated ';
-+ 		} elseif( $_GET['sortby'] == 'blogname' ) {
-  			$query .= ' ORDER BY domain ';
-  		}
-+ 		
-+ 		$query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
-+ 		
-+ 		if ( $_GET['ip_address'] == '' ) {
-+ 			$query .= " LIMIT " . intval( $start ) . ", " . intval( $num );
-  		}
-+ 			
-+ 		$blog_list = $wpdb->get_results( $query, ARRAY_A );	
-+ 		
-+ 		$next = ( count( $blog_list ) < $num ) ? false : true;
-+ 		
-+ 		// Pagination
-+ 		$url2 = "order=" . $_GET['order'] . "&amp;sortby=" . $_GET['sortby'] . "&amp;s=" . $_GET['s'] . "&ip_address=" . $_GET['ip_address'];
-  
-+ 		$blog_navigation = '';
-+ 		if( $start == 0 ) { 
-+ 			$blog_navigation .= __('Previous&nbsp;Blogs');
-+ 		} elseif( $start <= 30 ) { 
-+ 			$blog_navigation .= '<a href="wpmu-blogs.php?start=0&amp;' . $url2 . ' ">' . __('Previous&nbsp;Blogs') . '</a>';
-  		} else {
-+ 			$blog_navigation .= '<a href="wpmu-blogs.php?start=' . ( $start - $num ) . '&' . $url2 . '">' . __('Previous&nbsp;Blogs') . '</a>';
-+ 		} 
-+ 		if ( $next ) {
-+ 			$blog_navigation .= '&nbsp;||&nbsp;<a href="wpmu-blogs.php?start=' . ( $start + $num ) . '&' . $url2 . '">' . __('Next&nbsp;Blogs') . '</a>';
-+ 		} else {
-+ 			$blog_navigation .= '&nbsp;||&nbsp;' . __('Next&nbsp;Blogs');
-  		}
-+ 		?>
-+ 		<script type="text/javascript">
-+ 		<!--
-+ 		var checkflag = "false";
-+ 		
-+ 		function check_all_rows() {
-+ 			var button1 = document.getElementById('check_all1'); 
-+ 			var button2 = document.getElementById('check_all2');
-+ 	  
-+ 			field = document.formlist;
-+ 			if (checkflag == "false") {
-+ 				for (i = 0; i < field.length; i++) {
-+ 					if( field[i].name == 'allblogs[]' ) {
-+ 						field[i].checked = true;
-+ 					}
-+ 				}
-+ 				checkflag = "true";
-+ 				button1.value = "<?php _e('Uncheck All') ?>";
-+ 				button2.value = "<?php _e('Uncheck All') ?>";
-+ 			} else {
-+ 				for (i = 0; i < field.length; i++) {
-+ 					if( field[i].name == 'allblogs[]' ) {
-+ 						field[i].checked = false;
-+ 					}
-+ 				}
-+ 				checkflag = "false";
-+ 				button1.value = "<?php _e('Check All') ?>"; 
-+ 				button2.value = "<?php _e('Check All') ?>"
-+ 			}
-+ 		}		
-+ 		//  -->
-+ 		</script>
-+ 		<div class="wrap">
-+ 		<h2><?php _e('Blogs') ?></h2>
-+ 		<div style="float:right; padding:0 20px; margin-top:20px;"> 
-+ 			<h4 style="margin:0 0 4px;"><?php _e('Blog Navigation') ?></h4> 
-+ 			<?php echo $blog_navigation; ?>
-+ 		</div>
-+ 		
-+ 		<form id="searchform" action="wpmu-blogs.php" method="get"> 
-+ 			<input type="hidden" name="action" value="blogs" />
-+ 			<fieldset>
-+ 				<legend><?php _e('Search blogs by name&hellip;') ?></legend> 
-+ 				<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes(wp_specialchars($_GET['s'], 1)); ?>" size="17" />
-+ 			</fieldset>
-+ 			
-+ 			<fieldset>
-+ 				<legend><?php _e('by blog ID&hellip;') ?></legend> 
-+ 				<input type="text" name="blog_id" value="<?php if (isset($_GET['blog_id'])) echo wp_specialchars($_GET['blog_id'], 1); ?>" size="10" />
-+ 			</fieldset>
-+ 			
-+ 			<fieldset>
-+ 				<legend><?php _e('by IP address&hellip;') ?></legend> 
-+ 				<input type="text" name="ip_address" value="<?php if (isset($_GET['ip_address'])) echo wp_specialchars($_GET['ip_address'], 1); ?>" size="10" />
-+ 			</fieldset>			
-+ 			<input type="submit" name="submit" id="post-query-submit" value="<?php _e('Search') ?>" class="button" /> 
-+ 		</form>
-  
-+ 		
-+ 		<br style="clear:both;" />	
-+ 		
-+ 		<?php if( isset($_GET['s']) && !empty($_GET['s']) ) : ?>
-+ 			<p><a href="wpmu-users.php?action=users&s=<?php echo stripslashes(wp_specialchars($_GET['s'], 1)) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes(wp_specialchars($_GET['s'], 1)); ?></strong></a></p>
-+ 		<?php endif; ?>				
-+ 	
-+ 		<?php
-+ 		// define the columns to display, the syntax is 'internal name' => 'display name'
-+ 		$posts_columns = array(
-+ 		'id'           => __('ID'),
-+ 		'blogname'     => __('Blog Name'),
-+ 		'lastupdated'  => __('Last Updated'),
-+ 		'registered'   => __('Registered'),
-+ 		'users'        => __('Users'),
-+ 		'plugins'      => __('Actions')
-+ 		);
-+ 		$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
-  
-+ 		// you can not edit these at the moment
-+ 		$posts_columns['control_view'] 		= '';
-+ 		$posts_columns['control_edit']      = '';
-+ 		$posts_columns['control_backend']   = '';
-+ 		$posts_columns['control_deactivate']= '';
-+ 		$posts_columns['control_archive']   = '';
-+ 		$posts_columns['control_spam']   	= '';
-+ 		$posts_columns['control_delete']    = '';
-  
-+ 		$sortby_url = "s=" . $_GET['s'] . "&amp;ip_address=" . $_GET['ip_address'];
-+ 		?>
-+ 		<form name="formlist" action="wpmu-edit.php?action=allblogs" method="post">
-+ 		<input style="margin:5px 0;" id="check_all1" class="button" type="button" value="<?php _e('Check All') ?>" onclick="check_all_rows()" /> 
-+ 		
-+ 		<table width="100%" cellpadding="3" cellspacing="3" class="widefat">
-+ 			<thead>
-+ 				<tr>
-+ 					<?php foreach($posts_columns as $column_id => $column_display_name) : ?>
-+ 						<th scope="col"><a href="wpmu-blogs.php?<?php echo $sortby_url ?>&amp;sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th>
-+ 					<?php endforeach ?>
-+ 				</tr>
-+ 			</thead>
-+ 			<tbody id="the-list">
-+ 			<?php
-+ 			if ($blog_list) {
-+ 				$bgcolor = '';
-+ 				$status_list = array( "archived" => "#fee", "spam" => "#faa", "deleted" => "#f55" );
-+ 				foreach ($blog_list as $blog) { 
-+ 					$class = ('alternate' == $class) ? '' : 'alternate';
-+ 					reset( $status_list );
-+ 					
-+ 					$bgcolour = "";
-+ 					foreach ( $status_list as $status => $col ) {
-+ 						if( get_blog_status( $blog['blog_id'], $status ) == 1 ) {
-+ 							$bgcolour = "style='background: $col'";
-+ 						}
-+ 					}
-+ 					echo "<tr $bgcolour class='$class'>";
-+ 					
-+ 					$blogname = ( constant( "VHOST" ) == 'yes' ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path']; 
-  
-+ 					foreach( $posts_columns as $column_name=>$column_display_name ) {
-+ 						switch($column_name) {
-+ 							case 'id': ?>
-+ 								<th scope="row">
-+ 									<input type='checkbox' id='blog_<?php echo $blog['blog_id'] ?>' name='allblogs[]' value='<?php echo $blog['blog_id'] ?>' /> <label for='blog_<?php echo $blog['blog_id'] ?>'><?php echo $blog['blog_id'] ?></label>
-+ 								</th>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'blogname': ?>
-+ 								<td valign="top">
-+ 									<label for='blog_<?php echo $blog['blog_id'] ?>'><?php echo $blogname ?></label>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'lastupdated': ?>
-+ 								<td valign="top">
-+ 									<?php echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __("Never") : mysql2date(__('Y-m-d \<\b\r \/\> g:i:s a'), $blog['last_updated']); ?>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'registered': ?>
-+ 								<td valign="top">
-+ 									<?php echo mysql2date(__('Y-m-d \<\b\r \/\> g:i:s a'), $blog['registered']); ?>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'users': ?>
-+ 								<td valign="top">
-+ 									<?php
-+ 									$blogusers = get_users_of_blog( $blog['blog_id'] ); 
-+ 									if( is_array( $blogusers ) ) {
-+ 										if( $blog['blog_id'] == 1 && count( $blogusers ) > 10 ) {
-+ 											$blogusers = array_slice( $blogusers, 0, 10 );
-+ 										}
-+ 										foreach ( $blogusers as $key => $val ) {
-+ 											echo '<a href="user-edit.php?user_id=' . $val->user_id . '">' . $val->user_login . '</a> ('.$val->user_email.')<br />'; 
-+ 										}
-+ 									}
-+ 									?>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'control_view': ?>
-+ 								<td valign="top">
-+ 									<a href="http://<?php echo $blog['domain']. $blog['path']; ?>" rel="permalink" class="edit"><?php _e('View'); ?></a>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'control_edit': ?>
-+ 								<td valign="top">
-+ 									<?php echo "<a href='wpmu-blogs.php?action=editblog&amp;id=".$blog['blog_id']."' class='edit'>" . __('Edit') . "</a>"; ?>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'control_backend':
-+ 							?>
-+ 								<td valign="top">
-+ 									<?php echo "<a href='http://" . $blog['domain'] . $blog['path'] . "wp-admin/' class='edit'>" . __('Backend') . "</a>"; ?>
-+ 								</td>
-+ 							<?php
-+ 							break;
-  
-+ 							case 'control_spam': 
-+ 								if( get_blog_status( $blog['blog_id'], "spam" ) == '1' ) { ?>
-+ 									<td valign="top">
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=unspamblog&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to unspam the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to mark as not spam this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Not Spam") ?></a>
-+ 									</td>
-+ 								<?php } else { ?>
-+ 									<td valign='top'>
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=spamblog&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to mark the blog %s as spam" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to mark as spam this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Spam") ?></a>
-+ 									</td>
-+ 								<?php }
-+ 							break;
-  
-+ 							case 'control_deactivate':
-+ 								if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) { ?>
-+ 									<td valign="top">
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=activateblog&amp;ref=<?php echo urlencode( $_SERVER['REQUEST_URI'] ) ?>&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to activate the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to activate this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Activate") ?></a>
-+ 									</td>
-+ 								<?php } else { ?>
-+ 									<td valign="top">
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=deactivateblog&amp;ref=<?php echo urlencode( $_SERVER['REQUEST_URI'] ) ?>&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to deactivate the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to deactive this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Deactivate") ?></a>
-+ 									</td>
-+ 								<?php }
-+ 							break;
-  
-+ 							case 'control_archive':
-+ 								if( get_blog_status( $blog['blog_id'], "archived" ) == '1' ) { ?>
-+ 									<td valign="top">
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to unarchive the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to unarchive this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Unarchive") ?></a>
-+ 									</td>
-+ 								<?php } else { ?>
-+ 									<td valign="top">
-+ 										<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=archiveblog&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to archive the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to archive this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Archive") ?></a>
-+ 									</td>
-+ 								<?php }
-+ 							break;
-  
-+ 							case 'control_delete': ?>
-+ 								<td valign="top">
-+ 									<a class='delete' href="wpmu-edit.php?action=confirm&amp;action2=deleteblog&amp;id=<?php echo $blog['blog_id'] ?>&amp;msg=<?php echo urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) ?>" onclick="return deleteSomething( 'blog', <?php echo $blog['blog_id']; ?>, '<?php echo js_escape(sprintf(__("You are about to delete this blog '%s'.\n'OK' to delete, 'Cancel' to stop."), $blogname)); ?>' );"><?php _e("Delete") ?></a>
-+ 								</td>
-+ 							<?php break;
-  
-+ 							case 'plugins': ?>
-+ 								<td valign="top">
-+ 									<?php do_action( "wpmublogsaction", $blog['blog_id'] ); ?>
-+ 								</td>
-+ 							<?php break;
-  
-+ 							default: ?>
-+ 								<td valign="top">
-+ 									<?php do_action('manage_blogs_custom_column', $column_name, $blog['blog_id']); ?>
-+ 								</td>
-+ 							<?php break;
-+ 						}
-+ 					}
-+ 					?>
-+ 					</tr>
-+ 					<?php
-+ 				}
-+ 			} else { ?>
-+ 				<tr style='background-color: <?php echo $bgcolor; ?>'> 
-+ 					<td colspan="8"><?php _e('No blogs found.') ?></td> 
-+ 				</tr> 
-  			<?php
-+ 			} // end if ($blogs)
-  			?>
-+ 			</tbody>
-+ 		</table>
-+ 		
-+ 		<div style="float:right; padding:0 20px; margin-top:20px;"> 
-+ 			<h4 style="margin:0 0 4px;"><?php _e('Blog Navigation') ?></h4> 
-+ 			<?php echo $blog_navigation;?>
-+ 		</div>
-  
-+ 		<input style="margin:5px 0;" id="check_all2" type="button" class="button" value="<?php _e('Check All') ?>" onclick="check_all_rows()" /> 
-+ 		
-+ 		<h3><?php _e('Update selected blogs:') ?></h3>
-+ 		<ul style="list-style:none;">
-+ 			<li><input type='radio' name='blogfunction' id='delete' value='delete' /> <label for='delete'><?php _e('Delete') ?></label></li>
-+ 			<li><input type='radio' name='blogfunction' id='spam' value='spam' /> <label for='spam'><?php _e('Mark as Spam') ?></label></li>
-+ 		</ul>
-+ 		
-+ 		<p class="submit" style="width: 220px">
-+ 			<?php wp_nonce_field( "allblogs" ); ?>
-+ 			<input type='hidden' name='redirect' value='<?php echo $_SERVER['REQUEST_URI'] ?>' />
-+ 			<input type='submit' class="button" value='<?php _e('Apply Changes') ?>' /></p>
-+ 		</form>
-+ 		</div>
-+ 		
-+ 		<div class="wrap">
-+ 			<h2><?php _e('Add Blog') ?></h2>
-+ 			<form method="post" action="wpmu-edit.php?action=addblog">
-+ 				<?php wp_nonce_field('add-blog') ?>
-+ 				<table cellpadding="3" cellspacing="3">
-+ 					<tr>
-+ 						<th style="text-align:center;" scope='row'><?php _e('Blog Address') ?></th>
-+ 						<td>
-+ 						<?php if( constant( "VHOST" ) == 'yes' ) : ?>
-+ 							<input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?>
-+ 						<?php else:
-+ 							echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>
-+ 						<?php endif; ?>
-+ 						</td>
-+ 					</tr>
-+ 					<tr><th style="text-align:center;" scope='row'><?php _e('Blog Title') ?></th><td><input name="blog[title]" type="text" size="20" title="<?php _e('Title') ?>"/></td></tr>
-+ 					<tr><th style="text-align:center;" scope='row'><?php _e('Admin Email') ?></th><td><input name="blog[email]" type="text" size="20" title="<?php _e('Email') ?>"/></td></tr>
-+ 					<tr><td colspan='2'><?php _e('A new user will be created if the above email address is not in the database.') ?></td></tr>
-+ 				</table>
-+ 				<input class="button" type="submit" name="go" value="<?php _e('Add Blog') ?>" />
-+ 			</form>
-+ 		</div>
-  		<?php
-+ 	break;
-  } // end switch( $action )
-  
-+ include('admin-footer.php'); ?>
\ No newline at end of file