diff -ru wordpress-3.3/wp-admin/network/settings.php /var/www/saytlar/blogo/wp-admin/network/settings.php
|
old
|
new
|
|
| 65 | 65 | $limited_email = array(); |
| 66 | 66 | foreach ( (array) $limited_email_domains as $domain ) { |
| 67 | 67 | $domain = trim( $domain ); |
| 68 | | if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) |
| | 68 | if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) |
| 69 | 69 | $limited_email[] = trim( $domain ); |
| 70 | 70 | } |
| 71 | 71 | update_site_option( 'limited_email_domains', $limited_email ); |
| … |
… |
|
| 78 | 78 | $banned = array(); |
| 79 | 79 | foreach ( (array) $banned_email_domains as $domain ) { |
| 80 | 80 | $domain = trim( $domain ); |
| 81 | | if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) |
| | 81 | if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) |
| 82 | 82 | $banned[] = trim( $domain ); |
| 83 | 83 | } |
| 84 | 84 | update_site_option( 'banned_email_domains', $banned ); |
diff -ru wordpress-3.3/wp-admin/network/site-new.php /var/www/saytlar/blogo/wp-admin/network/site-new.php
|
old
|
new
|
|
| 127 | 127 | <?php } else { |
| 128 | 128 | echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/> |
| 129 | 129 | <?php } |
| 130 | | echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>'; |
| | 130 | echo '<p>' . __( 'Only letters, digits and dashes are recommended.' ) . '</p>'; |
| 131 | 131 | ?> |
| 132 | 132 | </td> |
| 133 | 133 | </tr> |
diff -ru wordpress-3.3/wp-includes/ms-functions.php /var/www/saytlar/blogo/wp-includes/ms-functions.php
|
old
|
new
|
|
| 563 | 563 | if ( empty( $blogname ) ) |
| 564 | 564 | $errors->add('blogname', __('Please enter a site name')); |
| 565 | 565 | |
| 566 | | if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) |
| | 566 | if ( preg_match( '/[^a-z0-9-]+/', $blogname ) ) |
| 567 | 567 | $errors->add('blogname', __('Only lowercase letters and numbers allowed')); |
| 568 | 568 | |
| 569 | 569 | if ( in_array( $blogname, $illegal_names ) == true ) |
diff -ru wordpress-3.3/wp-signup.php /var/www/saytlar/blogo/wp-signup.php
|
old
|
new
|
|
| 73 | 73 | if ( !is_subdomain_install() ) |
| 74 | 74 | 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 />'; |
| 75 | 75 | else |
| 76 | | 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 />'; |
| | 76 | 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 />'; |
| 77 | 77 | |
| 78 | 78 | if ( !is_user_logged_in() ) { |
| 79 | 79 | if ( !is_subdomain_install() ) |
| … |
… |
|
| 127 | 127 | echo '<p class="error">'.$errmsg.'</p>'; |
| 128 | 128 | } |
| 129 | 129 | echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="60" /><br />'; |
| 130 | | _e( '(Must be at least 4 characters, letters and numbers only.)' ); |
| | 130 | _e( '(Must be at least 4 characters, latin letters and numbers only.)' ); |
| 131 | 131 | ?> |
| 132 | 132 | |
| 133 | 133 | <label for="user_email"><?php _e( 'Email Address:' ) ?></label> |
| … |
… |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | // Main |
| | 377 | $_POST['blogname']=idn_to_ascii($_POST['blogname']); |
| 377 | 378 | $active_signup = get_site_option( 'registration' ); |
| 378 | 379 | if ( !$active_signup ) |
| 379 | 380 | $active_signup = 'all'; |