X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/58f607a1de715c9bca69340a4d6fb9e1b9c2bed2..8a4706fdeb1ae30268e510df6ccf3c39b3028059:/wp-signup.php
diff --git a/wp-signup.php b/wp-signup.php
index 28b561a9..7d35d865 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -3,10 +3,9 @@
/** Sets up the WordPress Environment. */
require( dirname(__FILE__) . '/wp-load.php' );
-add_action( 'wp_head', 'signuppageheaders' ) ;
+add_action( 'wp_head', 'wp_no_robots' );
require( './wp-blog-header.php' );
-require_once( ABSPATH . WPINC . '/registration.php' );
if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
wp_redirect( network_home_url() );
@@ -14,21 +13,17 @@ if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) &&
}
function do_signup_header() {
- do_action("signup_header");
+ do_action( 'signup_header' );
}
add_action( 'wp_head', 'do_signup_header' );
-function signuppageheaders() {
- echo " \n";
-}
-
if ( !is_multisite() ) {
- wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
+ wp_redirect( site_url('wp-login.php?action=register') );
die();
}
if ( !is_main_site() ) {
- wp_redirect( network_home_url( 'wp-signup.php' ) );
+ wp_redirect( network_site_url( 'wp-signup.php' ) );
die();
}
@@ -81,12 +76,11 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . ' ';
if ( !is_user_logged_in() ) {
- print '(' . __( 'Your address will be ' );
if ( !is_subdomain_install() )
- print $current_site->domain . $current_site->path . __( 'sitename' );
+ $site = $current_site->domain . $current_site->path . __( 'sitename' );
else
- print __( 'domain.' ) . $site_domain . $current_site->path;
- echo '. ) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '
';
+ $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+ echo '
-
+
checked="checked" />
@@ -190,7 +184,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
@@ -215,7 +209,7 @@ function validate_another_blog_signup() {
$meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
$meta = apply_filters( 'add_signup_meta', $meta );
- wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+ 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;
}
@@ -224,7 +218,7 @@ function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $u
?>
{$blog_title}" ) ?>
- http://%2$s is your new site. Log in as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
+ http://%2$s is your new site. Log in 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 ));
@@ -254,7 +243,7 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
site_name ) ?>
@@ -352,7 +341,7 @@ function validate_blog_signup() {
$public = (int) $_POST['blog_public'];
$meta = array ('lang_id' => 1, 'public' => $public);
- $meta = apply_filters( "add_signup_meta", $meta );
+ $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);
@@ -393,19 +382,15 @@ $i18n_signup['blog'] = _x('blog', 'Multisite active signup type');
$i18n_signup['user'] = _x('user', 'Multisite active signup type');
if ( is_super_admin() )
- echo '' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your
Options page .' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'ms-options.php' ) ) ) . '
';
+ echo '' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your
Options page .' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '
';
$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
$current_user = wp_get_current_user();
-if ( $active_signup == "none" ) {
+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' ));
+ $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) );
echo sprintf( __( 'You must first log in , and then you can create a new site.' ), $login_url );
} else {
$stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
@@ -428,7 +413,7 @@ if ( $active_signup == "none" ) {
case 'default':
default :
$user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
- do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere?
+ 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' ) )