From 166dbfef77ed975acc7b722279be0c0c96e2d039 Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 4 Jun 2008 17:09:47 +0000 Subject: tableless signup form, props momo360modena, fixes #482 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1321 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-signup.php | 445 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 211 insertions(+), 234 deletions(-) diff --git a/wp-signup.php b/wp-signup.php index 13446de..ee07827 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -24,47 +24,47 @@ if( $current_blog->domain . $current_blog->path != $current_site->domain . $curr } function wpmu_signup_stylesheet() { -?> - - + +
+
get_error_message('blog_id') ) - print ''; - else - print ''; - + // Blog name if( constant( "VHOST" ) == 'no' ) - echo '' . __('Blog Name:') . ''; + echo ''; else - echo '' . __('Blog Domain:') . ''; + echo ''; + + if ( $errmsg = $errors->get_error_message('blog_id') ) { ?> +

+ get_error_message('blog_id') ) { - ?>

' . $current_site->domain . $current_site->path . '
'; + echo '' . $current_site->domain . $current_site->path . '
'; } else { - print '.' . $current_site->domain . $current_site->path . '
'; + echo '.' . $current_site->domain . $current_site->path . '
'; } if ( !is_user_logged_in() ) { print '(' . __( 'Your address will be ' ); @@ -73,91 +73,76 @@ function show_blog_form($blog_id = '', $blog_title = '', $errors = '') { } else { print __( 'domain.' ) . $current_site->domain . $current_site->path; } - print '.' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . ' '; + echo '. ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '

'; } // Blog Title - if ( $errors->get_error_message('blog_title')) { - print ''; - } else { - print ''; - } -?> + + get_error_message('blog_title') ) { ?> +

+

'; + ?> - if ( $errmsg = $errors->get_error_message('blog_title') ) { -?>

- '; -?> - - - -
- - + + +
+ + +

+ + get_error_message('user_name') ) { - print ''; - } else { - print ''; - } - - echo '' . __('Username:') . ''; - + // User name + echo ''; if ( $errmsg = $errors->get_error_message('user_name') ) { - ?>


'; - _e('(Must be at least 4 characters, letters and numbers only.)'); echo ' '; - - // User Email - if ( $errors->get_error_message('user_email') ) { - print ''; - } else { - print ''; - } -?>get_error_message('user_email') ) { -?>

'.$errmsg.'

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

+ +
triple-check it.)') ?> get_error_message('generic') ) - print ' '.$errmsg.' '; + if ( $errmsg = $errors->get_error_message('generic') ) { + echo '

'.$errmsg.'

'; + } do_action( 'signup_extra_fields', $errors ); } function validate_user_form() { - $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); - - return $result; + return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); } function signup_another_blog($blog_id = '', $blog_title = '', $errors = '') { - global $current_user, $wpdb, $domain, $current_site; - - if ( ! is_wp_error($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('blog_id' => $blog_id, 'blog_title' => $blog_title, 'errors' => $errors )); @@ -170,34 +155,31 @@ function signup_another_blog($blog_id = '', $blog_title = '', $errors = '') { 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) ) { - ?>

-

-
- - - - - - - - -
 
-
- +

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($blog_id, $blog_title, $errors); - return; + return false; } $public = (int) $_POST['blog_public']; @@ -219,20 +201,23 @@ function validate_another_blog_signup() { 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) ?>

- +

{$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) ?> +

+ -

site_name ) ?>

-
- - - - - - - - - - - - -
  -

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

-
 
-
- + +

site_name ) ?>

+
+ + + + +

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

+ + +
+ get_error_code() ) { signup_user($user_name, $user_email, $errors); - return; + return false; } if ( 'blog' == $_POST['signup_for'] ) { signup_blog($user_name, $user_email); - return; + 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) ?>

-

- +

+

you must activate it.') ?>

+

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

+

+ -
- - - - - - - - - - -
 
-
- +
+ + + + + +

+

+
+ get_error_code() ) { signup_user($user_name, $user_email, $errors); - return; + return false; } $result = wpmu_validate_blog_signup($_POST['blog_id'], $_POST['blog_title']); @@ -355,7 +330,7 @@ function validate_blog_signup() { if ( $errors->get_error_code() ) { signup_blog($user_name, $user_email, $blog_id, $blog_title, $errors); - return; + return false; } $public = (int) $_POST['blog_public']; @@ -363,24 +338,27 @@ function validate_blog_signup() { $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) ?>

-

-

-

-
    -

    • -

    • -
    • -
- +

{$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 ) . "
"; -} +if( is_site_admin() ) + echo '
' . 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; @@ -401,49 +378,49 @@ $current_user = wp_get_current_user(); if( $active_signup == "none" ) { _e( "Registration has been disabled." ); } else { - if( $active_signup == 'blog' && !is_user_logged_in() ) { + if( $active_signup == 'blog' && !is_user_logged_in() ) wp_die( 'You must be logged in to register a blog.' ); - } - 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 . '/'; + 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 - $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; - printf(__("

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

"), $newblog ); - } + _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; + printf(__("

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

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