Applied redirection patch from bug #27.

In blogs display, use $path if using subdirs


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

4 files changed, 52 insertions, 52 deletions

diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php
index 599e4a0..a412e4c 100644
--- a/wp-admin/wpmu-blogs.php
+++ b/wp-admin/wpmu-blogs.php
@@ -412,7 +412,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'blogname':
 		?>
-		<td valign='top'><label for='<?php echo $blog[ 'blog_id' ] ?>'><?php echo str_replace( '.' . $current_site->domain, '', $blog[ 'domain' ] ) ?></label>
+		<td valign='top'><label for='<?php echo $blog[ 'blog_id' ] ?>'><?php if( constant( "VHOST" ) == 'yes' ) { echo str_replace( '.' . $current_site->domain, '', $blog[ 'domain' ] ); } else { echo $blog[ 'path' ]; } ?></label>
 		</td>
 		<?php
 		break;
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index ee9913c..766fd94 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -30,7 +30,7 @@ switch( $_GET[ 'action' ] ) {
 		$site_admins = explode( ' ', $_POST['site_admins'] );
 		if ( is_array( $site_admins ) )
 			update_site_option( 'site_admins' , $site_admins );
-		header( "Location: wpmu-options.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-options.php" );
 		exit;
 	break;
 	case "searchcategories":
@@ -74,7 +74,7 @@ switch( $_GET[ 'action' ] ) {
 		update_site_option( "dashboardfeed2", $_POST[ 'dashboardfeed2' ] );
 		update_site_option( "dashboardfeed1name", $_POST[ 'dashboardfeed1name' ] );
 		update_site_option( "dashboardfeed2name", $_POST[ 'dashboardfeed2name' ] );
-		header( "Location: wpmu-feeds.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-feeds.php" );
 	break;
 	case "updateblog":
 		if( is_site_admin() == false ) {
@@ -142,7 +142,7 @@ switch( $_GET[ 'action' ] ) {
 					$wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpmuBaseTablePrefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST[ 'new_role' ] ) . ":\"" . $_POST[ 'new_role' ] . "\";b:1;}')" );
 			}
 		}
-		header( "Location: wpmu-blogs.php?action=editblog&id=".$id."&updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&id=".$id );
 	break;
 	case "deleteblog":
 		if( is_site_admin() == false ) {
@@ -172,7 +172,7 @@ switch( $_GET[ 'action' ] ) {
 		if( isset( $_POST[ 'redirect' ] ) ) {
 			wpmu_admin_do_redirect( $_POST[ 'redirect' ] );
 		} else {
-			header( "Location: wpmu-blogs.php?updated=true" );
+			wpmu_admin_do_redirect( "wpmu-blogs.php" );
 		}
 	break;
 	case "activateblog":
@@ -180,7 +180,7 @@ switch( $_GET[ 'action' ] ) {
 			die( __('<p>You do not have permission to access this page.</p>') );
 		}
 		update_archived( $_GET[ 'id' ], '0' );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
 	case "deactivateblog":
 		if( is_site_admin() == false ) {
@@ -188,14 +188,14 @@ switch( $_GET[ 'action' ] ) {
 		}
 		do_action( "deactivate_blog", $_GET[ 'id' ] );
 		update_archived( $_GET[ 'id' ], '1' );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
 	case "unspamblog":
 		if( is_site_admin() == false ) {
 			die( __('<p>You do not have permission to access this page.</p>') );
 		}
 		update_blog_status( $_GET[ 'id' ], "spam", '0' );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
 	case "spamblog":
 		if( is_site_admin() == false ) {
@@ -203,17 +203,17 @@ switch( $_GET[ 'action' ] ) {
 		}
 		do_action( "make_spam_blog", $_GET[ 'id' ] );
 		update_blog_status( $_GET[ 'id' ], "spam", '1' );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
 	case "mature":
 		update_blog_status( $_GET[ 'id' ], 'mature', '1' );
 		do_action( 'mature_blog', $_GET[ 'id' ] );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
 	case "unmature":
 		update_blog_status( $_GET[ 'id' ], 'mature', '0' );
 		do_action( 'unmature_blog', $_GET[ 'id' ] );
-		header( "Location: wpmu-blogs.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-blogs.php" );
 	break;
     	case "updateuser":
 		if( is_site_admin() == false ) {
@@ -238,7 +238,7 @@ switch( $_GET[ 'action' ] ) {
 				$wpdb->query( $query );
 			}
 		}
-		header( "Location: wpmu-users.php?action=edit&id=".$id."&updated=true" );
+		wpmu_admin_do_redirect( "wpmu-users.php?action=edit&id=".$id );
 	break;
     	case "updatethemes":
 		if( is_site_admin() == false ) {
@@ -254,10 +254,10 @@ switch( $_GET[ 'action' ] ) {
 			}
 			update_site_option( 'allowed_themes', $allowed_themes );
 		}
-		header( "Location: wpmu-themes.php?updated=true" );
+		wpmu_admin_do_redirect( "wpmu-themes.php" );
 	break;
 	default:
-		header( "Location: wpmu-admin.php" );
+		wpmu_admin_do_redirect( "wpmu-admin.php" );
 	break;
 }
 ?>
diff --git a/wp-admin/wpmu-users.php b/wp-admin/wpmu-users.php
index fdcf55e..a8e556c 100644
--- a/wp-admin/wpmu-users.php
+++ b/wp-admin/wpmu-users.php
@@ -9,6 +9,30 @@ switch( $_GET[ 'action' ] ) {
 		wpmu_admin_do_redirect( "wpmu-users.php" );
 		die();
 	break;
+	case "allusers":
+		if( is_site_admin() == false ) {
+			die( __('<p>You do not have permission to access this page.</p>') );
+		}
+	if( is_array( $_POST[ 'allusers' ] ) ) {
+		while( list( $key, $val ) = each( $_POST[ 'allusers' ] ) ) {
+			if( $val != '' && $val != '0' && $val != '1' ) {
+				$user_details = get_userdata( $val );
+				if( $_POST[ 'userfunction' ] == 'delete' ) {
+					wpmu_delete_user($val);
+				} elseif( $_POST[ 'userfunction' ] == 'spam' ) {
+					$blogs = get_blogs_of_user( $val );
+					if( is_array( $blogs ) ) {
+						while( list( $key, $details ) = each( $blogs ) ) { 
+							update_blog_status( $details->userblog_id, "spam", '1' );
+							do_action( "make_spam_blog", $details->userblog_id );
+						}
+					}
+				}
+			}
+		}
+	}
+	wpmu_admin_do_redirect( "wpmu-users.php" );
+	break;
 }
 
 $title = __('WPMU Admin');
@@ -75,30 +99,6 @@ switch( $_GET[ 'action' ] ) {
     </p>
     <?php
     break;
-    case "allusers":
-	if( is_site_admin() == false ) {
-		die( __('<p>You do not have permission to access this page.</p>') );
-	}
-    	if( is_array( $_POST[ 'allusers' ] ) ) {
-		while( list( $key, $val ) = each( $_POST[ 'allusers' ] ) ) {
-			if( $val != '' && $val != '0' && $val != '1' ) {
-				$user_details = get_userdata( $val );
-				if( $_POST[ 'userfunction' ] == 'delete' ) {
-					wpmu_delete_user($val);
-				} elseif( $_POST[ 'userfunction' ] == 'spam' ) {
-					$blogs = get_blogs_of_user( $val );
-					if( is_array( $blogs ) ) {
-						while( list( $key, $details ) = each( $blogs ) ) { 
-							update_blog_status( $details->userblog_id, "spam", '1' );
-							do_action( "make_spam_blog", $details->userblog_id );
-						}
-					}
-				}
-			}
-		}
-	}
-    header( "Location: wpmu-users.php?updated=true" );
-    break;
     default:
 		if( isset( $_GET[ 'start' ] ) == false ) {
 			$start = 0;
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index c85d654..376b9fc 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -780,25 +780,25 @@ function wpmu_get_cache( $key, $path ) {
 // wpmu admin functions
 
 function wpmu_admin_do_redirect( $url = '' ) {
+	$url = wpmu_admin_redirect_add_updated_param( $url );
 	if( isset( $_GET[ 'redirect' ] ) ) {
 		if( substr( $_GET[ 'redirect' ], 0, 2 ) == 's_' ) {
-			header( "Location: {$url}?updated=true&action=blogs&s=". wp_specialchars( substr( $_GET[ 'redirect' ], 2 ) ) );
-			die();
+			$url .= "&action=blogs&s=". wp_specialchars( substr( $_GET[ 'redirect' ], 2 ) );
 		}
 	} elseif( isset( $_POST[ 'redirect' ] ) ) {
-		$url = $_POST[ 'redirect' ];
-		if( strpos( $url, 'updated=true' ) === false ) {
-			if( strpos( $url, '?' ) === true ) {
-				$url .=  '&updated=true';
-			} else {
-				$url .=  '?updated=true';
-			}
+		$url = wpmu_admin_redirect_add_updated_param( $_POST[ 'redirect' ] );
+	}
+	header( "Location: {$url}" );
+	die();
+}
+function wpmu_admin_redirect_add_updated_param( $url = '' ) {
+	if( strpos( $url, 'updated=true' ) === false ) {
+		if( strpos( $url, '?' ) === false ) {
+			return $url . '?updated=true';
+		} else {
+			return $url . '&updated=true';
 		}
-		header( "Location: {$url}" );
-		die();
-	} else {
-		header( "Location: {$url}?updated=true" );
-		die();
+		return $url;
 	}
 }