Ticket #19724: wp-3.3-idn-signup.diff

wp-admin/network/settings.php

@@ -65 +65 @@
                 $limited_email = array();
                 foreach ( (array) $limited_email_domains as $domain ) {
                         $domain = trim( $domain );
-                        if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
+                        if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
                                 $limited_email[] = trim( $domain );
                 }
                 update_site_option( 'limited_email_domains', $limited_email );
@@ -78 +78 @@
                 $banned = array();
                 foreach ( (array) $banned_email_domains as $domain ) {
                         $domain = trim( $domain );
-                        if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
+                        if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
                                 $banned[] = trim( $domain );
                 }
                 update_site_option( 'banned_email_domains', $banned );

wp-admin/network/site-new.php

@@ -127 +127 @@
                         <?php } else {
                                 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
                         <?php }
-                        echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
+                        echo '<p>' . __( 'Only letters, digits and dashes are recommended.' ) . '</p>';
                         ?>
                         </td>
                 </tr>

wp-includes/ms-functions.php

@@ -563 +563 @@
         if ( empty( $blogname ) )
                 $errors->add('blogname', __('Please enter a site name'));
 
-        if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
+        if ( preg_match( '/[^a-z0-9-]+/', $blogname ) )
                 $errors->add('blogname', __('Only lowercase letters and numbers allowed'));
 
         if ( in_array( $blogname, $illegal_names ) == true )

wp-signup.php

@@ -73 +73 @@
         if ( !is_subdomain_install() )
                 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
         else
-                echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
+                echo '<input name="blogname" type="text" id="blogname" value="'.idn_to_unicode(esc_attr($blogname)).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = idn_to_unicode( preg_replace( '|^www\.|', '', $current_site->domain ) ) ) . '</span><br />';
 
         if ( !is_user_logged_in() ) {
                 if ( !is_subdomain_install() )
@@ -127 +127 @@
                 echo '<p class="error">'.$errmsg.'</p>';
         }
         echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="60" /><br />';
-        _e( '(Must be at least 4 characters, letters and numbers only.)' );
+        _e( '(Must be at least 4 characters, latin letters and numbers only.)' );
         ?>
 
         <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
@@ -374 +374 @@
 }
 
 // Main
+$_POST['blogname']=idn_to_ascii($_POST['blogname']);
 $active_signup = get_site_option( 'registration' );
 if ( !$active_signup )
         $active_signup = 'all';