Ticket #5404: 5404.patch

wp-includes/pluggable.php

@@ -700 +700 @@
 }
 endif;
 
+if ( !function_exists('wp_test_password') ) :
+function wp_test_password($password) {
+        $error = "";
+        #Check that the password contains mixed case
+        $u = false;
+        $l = false;
+        for($i=0;$i<strlen($password) && !($u && $l);$i++){
+                $u = $u || (ord(substr($password,$i,1)) > 64 && ord(substr($password,$i,1)) < 91);
+                $l = $l || (ord(substr($password,$i,1)) > 96 && ord(substr($password,$i,1)) < 123);
+        } 
+        
+        if (!($u && $l)) $error .= __("The password is not mixed case<br/>\n");
+        #Check that the password contains numbers and letters
+        $a = false;
+        $n = false;
+        for($i=0;$i<strlen($password) && !($a && $n);$i++){
+                $a = $a || (ord(substr($password,$i,1)) > 64 && ord(substr($password,$i,1)) < 91) || (ord(substr($password,$i,1)) > 96 && ord(substr($password,$i,1)) < 123);
+                $n = $n || (ord(substr($password,$i,1)) > 47 && ord(substr($password,$i,1)) < 58);
+        }
+        if(!($a&&$n)) $error .= __("The password is not alphanumeric<br/>\n");
+        #Check password length
+        if(strlen($password)< 5) $error .= __("The password is not long enough<br/>\n");
+        return $error;  
+}
+endif;
+
 ?>

wp-includes/registration.php

@@ -207 +207 @@
         return wp_create_user($username, $password, $email);
 }
 
-?>
- No newline at end of file
+?>

wp-admin/includes/user.php

@@ -102 +102 @@
         if ( $pass1 != $pass2 )
                 $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' ), array( 'form-field' => 'pass1' ) );
 
+        /* Check password strength */
+        if ( get_option("strong_passwords") == 1 && wp_test_password($pass1) != "") $errors->add( 'pass', __('<strong>ERROR: </strong>') .wp_test_password($pass1), array( 'form-field' => 'pass1' ) );
+
         if (!empty ( $pass1 ))
                 $user->user_pass = $pass1;
 
@@ -284 +287 @@
         $user->remove_all_caps();
 }
 
-?>
- No newline at end of file
+?>

wp-admin/options-general.php

@@ -53 +53 @@
 <td><label for="default_role">
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
 </td>
+<tr valign="top">
+<th scope="row"><?php _e('Security:') ?></th>
+<td><label for="strong_passwords">
+<input name="strong_passwords" type="checkbox" id="strong_passwords" value="1" <?php checked('1', get_option('strong_passwords')); ?> />
+<?php _e('Enforce Strong Passwords') ?></label>
+</td>
 </tr>
 </table>
 <fieldset class="options">
@@ -97 +103 @@
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="<?php if ( ! defined( 'WP_SITEURL' ) ) echo 'siteurl,'; if ( ! defined( 'WP_HOME' ) ) echo 'home,'; ?>blogname,blogdescription,admin_email,users_can_register,gmt_offset,date_format,time_format,start_of_week,comment_registration,default_role" />
+<input type="hidden" name="page_options" value="<?php if ( ! defined( 'WP_SITEURL' ) ) echo 'siteurl,'; if ( ! defined( 'WP_HOME' ) ) echo 'home,'; ?>blogname,blogdescription,admin_email,users_can_register,gmt_offset,date_format,time_format,start_of_week,comment_registration,default_role,strong_passwords" />
 </p>
 </form>