From 336bec5923d7537295a3cca112cf2fd42c3297fe Mon Sep 17 00:00:00 2001 From: westi Date: Wed, 6 Jan 2010 07:50:12 +0000 Subject: [PATCH] Set svn-eolstyle on some files. See #11644. git-svn-id: http://svn.automattic.com/wordpress/trunk@12605 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-activate.php | 176 ++++---- wp-includes/ms-settings.php | 490 ++++++++++---------- wp-signup.php | 878 ++++++++++++++++++------------------ 3 files changed, 772 insertions(+), 772 deletions(-) diff --git a/wp-activate.php b/wp-activate.php index c6599f0dc..b51c81c91 100755 --- a/wp-activate.php +++ b/wp-activate.php @@ -1,88 +1,88 @@ -cache_enabled = false; - -do_action("activate_header"); - -function wpmu_activate_stylesheet() { - ?> - - - -
- - -

-
-

- -
-

-

- -

-
- - get_error_code() || 'blog_taken' == $result->get_error_code() ) { - $signup = $result->get_error_data(); - ?> -

- domain . $signup->path == '' ) { - printf(__('

Your account has been activated. You may now login to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword'); - } else { - printf(__('

Your blog at %2$s is active. You may now login to your blog using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword'); - } - } else { - ?> -

- '.$result->get_error_message().'

'; - } - } else { - extract($result); - $url = get_blogaddress_by_id( (int) $blog_id); - $user = new WP_User( (int) $user_id); - ?> -

- -
-

user_login ?>

-

-
- - domain . $current_site->path ) : ?> -

View your site or Login'), $url, $url . 'wp-login.php' ); ?>

- -

Login or go back to the homepage.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?>

- -
- - +cache_enabled = false; + +do_action("activate_header"); + +function wpmu_activate_stylesheet() { + ?> + + + +
+ + +

+
+

+ +
+

+

+ +

+
+ + get_error_code() || 'blog_taken' == $result->get_error_code() ) { + $signup = $result->get_error_data(); + ?> +

+ domain . $signup->path == '' ) { + printf(__('

Your account has been activated. You may now login to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword'); + } else { + printf(__('

Your blog at %2$s is active. You may now login to your blog using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.

'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword'); + } + } else { + ?> +

+ '.$result->get_error_message().'

'; + } + } else { + extract($result); + $url = get_blogaddress_by_id( (int) $blog_id); + $user = new WP_User( (int) $user_id); + ?> +

+ +
+

user_login ?>

+

+
+ + domain . $current_site->path ) : ?> +

View your site or Login'), $url, $url . 'wp-login.php' ); ?>

+ +

Login or go back to the homepage.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?>

+ +
+ + diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index 482b30472..1daa2d1fa 100755 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -1,245 +1,245 @@ -site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" ); - if ( !$current_site->site_name ) { - $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) ); - if( $current_site->site_name == null ) - $current_site->site_name = ucfirst( $current_site->domain ); - wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options'); - } - return $current_site; -} - -function wpmu_current_site() { - global $wpdb, $current_site, $domain, $path, $sites; - if( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) { - $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1); - $current_site->domain = DOMAIN_CURRENT_SITE; - $current_site->path = $path = PATH_CURRENT_SITE; - if( defined( 'BLOGID_CURRENT_SITE' ) ) - $current_site->blog_id = BLOGID_CURRENT_SITE; - return $current_site; - } - - $current_site = wp_cache_get( "current_site", "site-options" ); - if( $current_site ) - return $current_site; - - $wpdb->suppress_errors(); - $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site - if( count( $sites ) == 1 ) { - $current_site = $sites[0]; - $path = $current_site->path; - $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" ); - $current_site = get_current_site_name( $current_site ); - wp_cache_set( "current_site", $current_site, "site-options" ); - return $current_site; - } - $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) ); - if( constant( 'VHOST' ) == 'yes' ) { - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) ); - if( $current_site != null ) - return $current_site; - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) ); - if( $current_site != null ) { - $path = '/'; - return $current_site; - } - - $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) ); - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) ); - if( $current_site != null ) - return $current_site; - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) ); - if( $current_site == null && defined( "WP_INSTALLING" ) == false ) { - if( count( $sites ) == 1 ) { - $current_site = $sites[0]; - die( "That blog does not exist. Please try http://{$current_site->domain}{$current_site->path}" ); - } else { - die( "No WPMU site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance." ); - } - } else { - $path = '/'; - } - } else { - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) ); - if( $current_site != null ) - return $current_site; - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) ); - if( $current_site == null && defined( "WP_INSTALLING" ) == false ) { - if( count( $sites ) == 1 ) { - $current_site = $sites[0]; - die( "That blog does not exist. Please try http://{$current_site->domain}{$current_site->path}" ); - } else { - die( "No WPMU site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance." ); - } - } else { - $path = '/'; - } - } - return $current_site; -} - -$current_site = wpmu_current_site(); -if( !isset( $current_site->blog_id ) ) - $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" ); - -if( constant( 'VHOST' ) == 'yes' ) { - $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' ); - if( !$current_blog ) { - $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain) ); - if( $current_blog ) - wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' ); - } - if( $current_blog != null && $current_blog->site_id != $current_site->id ) { - $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE id = %d", $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, '?' ) ); - $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' ); - if ( $blogname != '' && !in_array( $blogname, $reserved_blognames ) && !is_file( $blogname ) ) { - $path = $path . $blogname . '/'; - } - $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' ); - if( !$current_blog ) { - $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path) ); - if( $current_blog ) - wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' ); - } -} - -if( defined( "WP_INSTALLING" ) == false && constant( 'VHOST' ) == 'yes' && !is_object( $current_blog ) ) { - if( defined( 'NOBLOGREDIRECT' ) ) { - $destination = constant( 'NOBLOGREDIRECT' ); - if ( $destination == '%siteurl%' ) - $destination = "http://" . $current_site->domain . $current_site->path; - header( "Location: " . $destination); - die(); - } else { - header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php?new=" . str_replace( '.' . $current_site->domain, '', $domain ) ); - die(); - } - -} - -if( defined( "WP_INSTALLING" ) == false ) { - if( $current_site && $current_blog == null ) { - if( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) { - header( "Location: http://" . $current_site->domain . $current_site->path ); - exit; - } - $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path) ); - } - if( $current_blog == false || $current_site == false ) - is_installed(); -} - -$blog_id = $current_blog->blog_id; -$public = $current_blog->public; - -if( $current_blog->site_id == 0 || $current_blog->site_id == '' ) - $current_blog->site_id = 1; -$site_id = $current_blog->site_id; - -$current_site = get_current_site_name( $current_site ); - -if( $blog_id == false ) { - // no blog found, are we installing? Check if the table exists. - if ( defined('WP_INSTALLING') ) { - $blog_id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs LIMIT 0,1" ); - if( $blog_id == false ) { - // table doesn't exist. This is the first blog - $blog_id = 1; - } else { - // table exists - // don't create record at this stage. we're obviously installing so it doesn't matter what the table vars below are like. - // default to using the "main" blog. - $blog_id = 1; - } - $current_blog->blog_id = $blog_id; - } else { - $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); - if( $check == false ) { - $msg = ': DB Tables Missing'; - } else { - $msg = ''; - } - die( "No Blog by that name on this system." . $msg ); - } -} - -$wpdb->suppress_errors( false ); - -if( '0' == $current_blog->public ) { - // This just means the blog shouldn't show up in google, etc. Only to registered members -} - -function is_installed() { - global $wpdb, $domain, $path; - $base = stripslashes( $base ); - if( defined( "WP_INSTALLING" ) == false ) { - $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); - $msg = "If your blog does not display, please contact the owner of this site.

If you are the owner of this site please check that MySQL is running properly and all tables are error free.

"; - if( $check == false ) { - $msg .= "Database Tables Missing.
Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really should look at your database now.
"; - } else { - $msg .= 'Could Not Find Blog!
'; - $msg .= "Searched for " . $domain . $path . " in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?
"; - } - $msg .= "
\n

What do I do now?

"; - $msg .= "Read the bug report page. Some of the guidelines there may help you figure out what went wrong.
"; - $msg .= "If you're still stuck with this message, then check that your database contains the following tables:"; - $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines!

"; - if( is_file( 'release-info.txt' ) ) { - $msg .= 'Your bug report must include the following text: "'; - $info = file( 'release-info.txt' ); - $msg .= $info[ 4 ] . '"'; - } - - die( "

Fatal Error

" . $msg ); - } -} - -?> +site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" ); + if ( !$current_site->site_name ) { + $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) ); + if( $current_site->site_name == null ) + $current_site->site_name = ucfirst( $current_site->domain ); + wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options'); + } + return $current_site; +} + +function wpmu_current_site() { + global $wpdb, $current_site, $domain, $path, $sites; + if( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) { + $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1); + $current_site->domain = DOMAIN_CURRENT_SITE; + $current_site->path = $path = PATH_CURRENT_SITE; + if( defined( 'BLOGID_CURRENT_SITE' ) ) + $current_site->blog_id = BLOGID_CURRENT_SITE; + return $current_site; + } + + $current_site = wp_cache_get( "current_site", "site-options" ); + if( $current_site ) + return $current_site; + + $wpdb->suppress_errors(); + $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site + if( count( $sites ) == 1 ) { + $current_site = $sites[0]; + $path = $current_site->path; + $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" ); + $current_site = get_current_site_name( $current_site ); + wp_cache_set( "current_site", $current_site, "site-options" ); + return $current_site; + } + $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) ); + if( constant( 'VHOST' ) == 'yes' ) { + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) ); + if( $current_site != null ) + return $current_site; + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) ); + if( $current_site != null ) { + $path = '/'; + return $current_site; + } + + $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) ); + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) ); + if( $current_site != null ) + return $current_site; + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) ); + if( $current_site == null && defined( "WP_INSTALLING" ) == false ) { + if( count( $sites ) == 1 ) { + $current_site = $sites[0]; + die( "That blog does not exist. Please try http://{$current_site->domain}{$current_site->path}" ); + } else { + die( "No WPMU site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance." ); + } + } else { + $path = '/'; + } + } else { + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) ); + if( $current_site != null ) + return $current_site; + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) ); + if( $current_site == null && defined( "WP_INSTALLING" ) == false ) { + if( count( $sites ) == 1 ) { + $current_site = $sites[0]; + die( "That blog does not exist. Please try http://{$current_site->domain}{$current_site->path}" ); + } else { + die( "No WPMU site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance." ); + } + } else { + $path = '/'; + } + } + return $current_site; +} + +$current_site = wpmu_current_site(); +if( !isset( $current_site->blog_id ) ) + $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" ); + +if( constant( 'VHOST' ) == 'yes' ) { + $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' ); + if( !$current_blog ) { + $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain) ); + if( $current_blog ) + wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' ); + } + if( $current_blog != null && $current_blog->site_id != $current_site->id ) { + $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE id = %d", $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, '?' ) ); + $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' ); + if ( $blogname != '' && !in_array( $blogname, $reserved_blognames ) && !is_file( $blogname ) ) { + $path = $path . $blogname . '/'; + } + $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' ); + if( !$current_blog ) { + $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path) ); + if( $current_blog ) + wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' ); + } +} + +if( defined( "WP_INSTALLING" ) == false && constant( 'VHOST' ) == 'yes' && !is_object( $current_blog ) ) { + if( defined( 'NOBLOGREDIRECT' ) ) { + $destination = constant( 'NOBLOGREDIRECT' ); + if ( $destination == '%siteurl%' ) + $destination = "http://" . $current_site->domain . $current_site->path; + header( "Location: " . $destination); + die(); + } else { + header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php?new=" . str_replace( '.' . $current_site->domain, '', $domain ) ); + die(); + } + +} + +if( defined( "WP_INSTALLING" ) == false ) { + if( $current_site && $current_blog == null ) { + if( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) { + header( "Location: http://" . $current_site->domain . $current_site->path ); + exit; + } + $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path) ); + } + if( $current_blog == false || $current_site == false ) + is_installed(); +} + +$blog_id = $current_blog->blog_id; +$public = $current_blog->public; + +if( $current_blog->site_id == 0 || $current_blog->site_id == '' ) + $current_blog->site_id = 1; +$site_id = $current_blog->site_id; + +$current_site = get_current_site_name( $current_site ); + +if( $blog_id == false ) { + // no blog found, are we installing? Check if the table exists. + if ( defined('WP_INSTALLING') ) { + $blog_id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs LIMIT 0,1" ); + if( $blog_id == false ) { + // table doesn't exist. This is the first blog + $blog_id = 1; + } else { + // table exists + // don't create record at this stage. we're obviously installing so it doesn't matter what the table vars below are like. + // default to using the "main" blog. + $blog_id = 1; + } + $current_blog->blog_id = $blog_id; + } else { + $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); + if( $check == false ) { + $msg = ': DB Tables Missing'; + } else { + $msg = ''; + } + die( "No Blog by that name on this system." . $msg ); + } +} + +$wpdb->suppress_errors( false ); + +if( '0' == $current_blog->public ) { + // This just means the blog shouldn't show up in google, etc. Only to registered members +} + +function is_installed() { + global $wpdb, $domain, $path; + $base = stripslashes( $base ); + if( defined( "WP_INSTALLING" ) == false ) { + $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); + $msg = "If your blog does not display, please contact the owner of this site.

If you are the owner of this site please check that MySQL is running properly and all tables are error free.

"; + if( $check == false ) { + $msg .= "Database Tables Missing.
Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really should look at your database now.
"; + } else { + $msg .= 'Could Not Find Blog!
'; + $msg .= "Searched for " . $domain . $path . " in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?
"; + } + $msg .= "
\n

What do I do now?

"; + $msg .= "Read the bug report page. Some of the guidelines there may help you figure out what went wrong.
"; + $msg .= "If you're still stuck with this message, then check that your database contains the following tables:"; + $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines!

"; + if( is_file( 'release-info.txt' ) ) { + $msg .= 'Your bug report must include the following text: "'; + $info = file( 'release-info.txt' ); + $msg .= $info[ 4 ] . '"'; + } + + die( "

Fatal Error

" . $msg ); + } +} + +?> diff --git a/wp-signup.php b/wp-signup.php index 291b8b258..b7b9dad98 100755 --- a/wp-signup.php +++ b/wp-signup.php @@ -1,439 +1,439 @@ -domain}{$current_site->path}" ); - die(); -} - -function do_signup_header() { - do_action("signup_header"); -} -add_action( 'wp_head', 'do_signup_header' ); - -function signuppageheaders() { - echo "\n"; -} - -if( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) { - wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" ); - die(); -} - -function wpmu_signup_stylesheet() { - ?> - - -
-
-' . __('Blog Name:') . ''; - else - echo ''; - - if ( $errmsg = $errors->get_error_message('blogname') ) { ?> -

- ' . $current_site->domain . $current_site->path . '
'; - } else { - echo '.' . $current_site->domain . $current_site->path . '
'; - } - if ( !is_user_logged_in() ) { - print '(' . __( 'Your address will be ' ); - if( constant( "VHOST" ) == 'no' ) { - print $current_site->domain . $current_site->path . __( 'blogname' ); - } else { - print __( 'domain.' ) . $current_site->domain . $current_site->path; - } - echo '. ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '

'; - } - - // Blog Title - ?> - - get_error_message('blog_title') ) { ?> -

-

'; - ?> - -
-

- - -

- - -

-
- - ' . __('Username:') . ''; - if ( $errmsg = $errors->get_error_message('user_name') ) { - echo '

'.$errmsg.'

'; - } - echo '
'; - _e('(Must be at least 4 characters, letters and numbers only.)'); - ?> - - - get_error_message('user_email') ) { ?> -

- -
triple-check it.)') ?> - get_error_message('generic') ) { - echo '

'.$errmsg.'

'; - } - do_action( 'signup_extra_fields', $errors ); -} - -function validate_user_form() { - return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); -} - -function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { - global $current_user, $current_site; - - if ( ! is_wp_error($errors) ) { - $errors = new WP_Error(); - } - - // allow definition of default variables - $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); - $blogname = $filtered_results['blogname']; - $blog_title = $filtered_results['blog_title']; - $errors = $filtered_results['errors']; - - echo '

' . sprintf( __('Get another %s blog in seconds'), $current_site->site_name ) . '

'; - - if ( $errors->get_error_code() ) { - echo "

" . __('There was a problem, please correct the form below and try again.') . "

"; - } - ?> -

add another blog to your account. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?>

- - ID); - if ( !empty($blogs) ) { ?> -

- -

-

- - -

-
- - - -

-
- get_error_code() ) { - signup_another_blog($blogname, $blog_title, $errors); - return false; - } - - $public = (int) $_POST['blog_public']; - $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // depreciated - $meta = apply_filters( "add_signup_meta", $meta ); - - wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid ); - confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); - return true; -} - -function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') { - ?> -

{$blog_title}" ) ?>

-

- http://%2$s is your new blog. Login as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?> -

- $user_name, 'user_email' => $user_email, 'errors' => $errors )); - $user_name = $filtered_results['user_name']; - $user_email = $filtered_results['user_email']; - $errors = $filtered_results['errors']; - - ?> - -

site_name ) ?>

-
- - - - -

- - - - - - /> - -
- /> - - -

- -

-
- get_error_code() ) { - signup_user($user_name, $user_email, $errors); - return false; - } - - if ( 'blog' == $_POST['signup_for'] ) { - signup_blog($user_name, $user_email); - return false; - } - - wpmu_signup_user($user_name, $user_email, apply_filters( "add_signup_meta", array() ) ); - - confirm_user_signup($user_name, $user_email); - return true; -} - -function confirm_user_signup($user_name, $user_email) { - ?> -

-

you must activate it.') ?>

-

%1$s and click the link given.'), $user_email) ?>

-

- $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); - $user_name = $filtered_results['user_name']; - $user_email = $filtered_results['user_email']; - $blogname = $filtered_results['blogname']; - $blog_title = $filtered_results['blog_title']; - $errors = $filtered_results['errors']; - - if ( empty($blogname) ) - $blogname = $user_name; - ?> -
- - - - - -

-
- get_error_code() ) { - signup_user($user_name, $user_email, $errors); - return false; - } - - $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']); - extract($result); - - if ( $errors->get_error_code() ) { - signup_blog($user_name, $user_email, $blogname, $blog_title, $errors); - return false; - } - - $public = (int) $_POST['blog_public']; - $meta = array ('lang_id' => 1, 'public' => $public); - $meta = apply_filters( "add_signup_meta", $meta ); - - wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); - confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta); - return true; -} - -function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) { - ?> -

{$blog_title}" ) ?>

- -

you must activate it.') ?>

-

%s and click the link given. It should arrive within 30 minutes.'), $user_email) ?>

-

-

-

- -

    -

    • -

    • -
    • -
-

- ' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your Options page." ), $active_signup ) . '
'; - -$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; - -$current_user = wp_get_current_user(); -if( $active_signup == "none" ) { - _e( "Registration has been disabled." ); -} elseif( $active_signup == 'blog' && !is_user_logged_in() ){ - if( is_ssl() ) { - $proto = 'https://'; - } else { - $proto = 'http://'; - } - $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' )); - echo sprintf( __( "You must first login, and then you can create a new blog."), $login_url ); -} else { - switch ($_POST['stage']) { - case 'validate-user-signup' : - if( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' ) - validate_user_signup(); - else - _e( "User registration has been disabled." ); - break; - case 'validate-blog-signup': - if( $active_signup == 'all' || $active_signup == 'blog' ) - validate_blog_signup(); - else - _e( "Blog registration has been disabled." ); - break; - case 'gimmeanotherblog': - validate_another_blog_signup(); - break; - default : - $user_email = $_POST[ 'user_email' ]; - do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere? - if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) { - signup_another_blog($newblogname); - } elseif( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) { - signup_user( $newblogname, $user_email ); - } elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) { - _e( "I'm sorry. We're not accepting new registrations at this time." ); - } else { - _e( "You're logged in already. No need to register again!" ); - } - if ($newblogname) { - if( constant( "VHOST" ) == 'no' ) - $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/'; - else - $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; - if ($active_signup == 'blog' || $active_signup == 'all') - printf(__("

The blog you were looking for, %s doesn't exist but you can create it now!

"), $newblog ); - else - printf(__("

The blog you were looking for, %s doesn't exist.

"), $newblog ); - } - break; - } -} -?> -
- - - +domain}{$current_site->path}" ); + die(); +} + +function do_signup_header() { + do_action("signup_header"); +} +add_action( 'wp_head', 'do_signup_header' ); + +function signuppageheaders() { + echo "\n"; +} + +if( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) { + wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" ); + die(); +} + +function wpmu_signup_stylesheet() { + ?> + + +
+
+' . __('Blog Name:') . ''; + else + echo ''; + + if ( $errmsg = $errors->get_error_message('blogname') ) { ?> +

+ ' . $current_site->domain . $current_site->path . '
'; + } else { + echo '.' . $current_site->domain . $current_site->path . '
'; + } + if ( !is_user_logged_in() ) { + print '(' . __( 'Your address will be ' ); + if( constant( "VHOST" ) == 'no' ) { + print $current_site->domain . $current_site->path . __( 'blogname' ); + } else { + print __( 'domain.' ) . $current_site->domain . $current_site->path; + } + echo '. ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '

'; + } + + // Blog Title + ?> + + get_error_message('blog_title') ) { ?> +

+

'; + ?> + +
+

+ + +

+ + +

+
+ + ' . __('Username:') . ''; + if ( $errmsg = $errors->get_error_message('user_name') ) { + echo '

'.$errmsg.'

'; + } + echo '
'; + _e('(Must be at least 4 characters, letters and numbers only.)'); + ?> + + + get_error_message('user_email') ) { ?> +

+ +
triple-check it.)') ?> + get_error_message('generic') ) { + echo '

'.$errmsg.'

'; + } + do_action( 'signup_extra_fields', $errors ); +} + +function validate_user_form() { + return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); +} + +function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { + global $current_user, $current_site; + + if ( ! is_wp_error($errors) ) { + $errors = new WP_Error(); + } + + // allow definition of default variables + $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $blogname = $filtered_results['blogname']; + $blog_title = $filtered_results['blog_title']; + $errors = $filtered_results['errors']; + + echo '

' . sprintf( __('Get another %s blog in seconds'), $current_site->site_name ) . '

'; + + if ( $errors->get_error_code() ) { + echo "

" . __('There was a problem, please correct the form below and try again.') . "

"; + } + ?> +

add another blog to your account. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?>

+ + ID); + if ( !empty($blogs) ) { ?> +

+ +

+

+ + +

+
+ + + +

+
+ get_error_code() ) { + signup_another_blog($blogname, $blog_title, $errors); + return false; + } + + $public = (int) $_POST['blog_public']; + $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // depreciated + $meta = apply_filters( "add_signup_meta", $meta ); + + wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid ); + confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); + return true; +} + +function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') { + ?> +

{$blog_title}" ) ?>

+

+ http://%2$s is your new blog. Login as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?> +

+ $user_name, 'user_email' => $user_email, 'errors' => $errors )); + $user_name = $filtered_results['user_name']; + $user_email = $filtered_results['user_email']; + $errors = $filtered_results['errors']; + + ?> + +

site_name ) ?>

+
+ + + + +

+ + + + + + /> + +
+ /> + + +

+ +

+
+ get_error_code() ) { + signup_user($user_name, $user_email, $errors); + return false; + } + + if ( 'blog' == $_POST['signup_for'] ) { + signup_blog($user_name, $user_email); + return false; + } + + wpmu_signup_user($user_name, $user_email, apply_filters( "add_signup_meta", array() ) ); + + confirm_user_signup($user_name, $user_email); + return true; +} + +function confirm_user_signup($user_name, $user_email) { + ?> +

+

you must activate it.') ?>

+

%1$s and click the link given.'), $user_email) ?>

+

+ $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $user_name = $filtered_results['user_name']; + $user_email = $filtered_results['user_email']; + $blogname = $filtered_results['blogname']; + $blog_title = $filtered_results['blog_title']; + $errors = $filtered_results['errors']; + + if ( empty($blogname) ) + $blogname = $user_name; + ?> +
+ + + + + +

+
+ get_error_code() ) { + signup_user($user_name, $user_email, $errors); + return false; + } + + $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']); + extract($result); + + if ( $errors->get_error_code() ) { + signup_blog($user_name, $user_email, $blogname, $blog_title, $errors); + return false; + } + + $public = (int) $_POST['blog_public']; + $meta = array ('lang_id' => 1, 'public' => $public); + $meta = apply_filters( "add_signup_meta", $meta ); + + wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); + confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta); + return true; +} + +function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) { + ?> +

{$blog_title}" ) ?>

+ +

you must activate it.') ?>

+

%s and click the link given. It should arrive within 30 minutes.'), $user_email) ?>

+

+

+

+ +

    +

    • +

    • +
    • +
+

+ ' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your Options page." ), $active_signup ) . '
'; + +$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; + +$current_user = wp_get_current_user(); +if( $active_signup == "none" ) { + _e( "Registration has been disabled." ); +} elseif( $active_signup == 'blog' && !is_user_logged_in() ){ + if( is_ssl() ) { + $proto = 'https://'; + } else { + $proto = 'http://'; + } + $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' )); + echo sprintf( __( "You must first login, and then you can create a new blog."), $login_url ); +} else { + switch ($_POST['stage']) { + case 'validate-user-signup' : + if( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' ) + validate_user_signup(); + else + _e( "User registration has been disabled." ); + break; + case 'validate-blog-signup': + if( $active_signup == 'all' || $active_signup == 'blog' ) + validate_blog_signup(); + else + _e( "Blog registration has been disabled." ); + break; + case 'gimmeanotherblog': + validate_another_blog_signup(); + break; + default : + $user_email = $_POST[ 'user_email' ]; + do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere? + if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) { + signup_another_blog($newblogname); + } elseif( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) { + signup_user( $newblogname, $user_email ); + } elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) { + _e( "I'm sorry. We're not accepting new registrations at this time." ); + } else { + _e( "You're logged in already. No need to register again!" ); + } + if ($newblogname) { + if( constant( "VHOST" ) == 'no' ) + $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/'; + else + $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; + if ($active_signup == 'blog' || $active_signup == 'all') + printf(__("

The blog you were looking for, %s doesn't exist but you can create it now!

"), $newblog ); + else + printf(__("

The blog you were looking for, %s doesn't exist.

"), $newblog ); + } + break; + } +} +?> +
+ + +