Redirect to signup form if blog not found (#28)

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

1 files changed, 10 insertions, 1 deletions

diff --git a/wpmu-settings.php b/wpmu-settings.php
index e80999b..9cb37d6 100644
--- a/wpmu-settings.php
+++ b/wpmu-settings.php
@@ -53,12 +53,17 @@ if( isset( $current_site ) == false ) {
 

 if( constant( 'VHOST' ) == 'yes' ) {

 	$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain'");

-	if( $current_blog != null )

+	if( $current_blog != null ) {

 		$current_site = $wpdb->get_row("SELECT * FROM $wpdb->site WHERE id='{$current_blog->site_id}'");

+	} else {

+		$blogname = substr( $domain, 0, strpos( $domain, '.' ) );

+	}

 } else {

 	$blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );

 	if( strpos( $blogname, '/' ) )

 		$blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );

+	if( strpos( $blogname, '?' ) )

+		$blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );

 	if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' || is_file( $blogname ) ) {

 		$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");

 	} else {

@@ -67,6 +72,10 @@ if( constant( 'VHOST' ) == 'yes' ) {
 }

 

 if( defined( "WP_INSTALLING" ) == false ) {

+	if( $current_site && $current_blog == null ) {

+		header( "Location: http://{$current_site->domain}{$current_site->path}wp-signup.php?new=" . urlencode( $blogname ) );

+		die();

+	}

 	if( $current_blog == false || $current_site == false )

 		is_installed();

 }