Changeset 6303 for trunk/wp-admin/includes/user.php

Timestamp:

11/01/2007 06:23:16 AM (18 years ago)

Author:

ryan

Message:

JS/AJAX form validation from mdawaffe. fixes #5299

File:

• trunk/wp-admin/includes/user.php (modified) (2 diffs)

trunk/wp-admin/includes/user.php

@@ -83 +83 @@
     do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
 
-    if (!$update ) {
-        if ( $pass1 == '' || $pass2 == '' )
-            $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter your password twice.' ));
-    } else {
-        if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) )
-            $errors->add( 'pass', __( '<strong>ERROR</strong>: You entered your new password only once.' ));
+    if ( $update ) {
+        if ( empty($pass1) && !empty($pass2) )
+            $errors->add( 'pass', __( '<strong>ERROR</strong>: You entered your new password only once.' ), array( 'form-field' => 'pass1' ) );
+        elseif ( !empty($pass1) && empty($pass2) )
+            $errors->add( 'pass', __( '<strong>ERROR</strong>: You entered your new password only once.' ), array( 'form-field' => 'pass2' ) );
+    } else {
+        if ( empty($pass1) )
+            $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter your password.' ), array( 'form-field' => 'pass1' ) );
+        elseif ( empty($pass2) )
+            $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter your password twice.' ), array( 'form-field' => 'pass2' ) );
     }
 
     /* Check for "\" in password */
     if( strpos( " ".$pass1, "\\" ) )
-        $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ));
+        $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 
     /* checking the password has been typed twice the same */
     if ( $pass1 != $pass2 )
-        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' ));
+        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' ), array( 'form-field' => 'pass1' ) );
 
     if (!empty ( $pass1 ))
@@ -110 +114 @@
     /* checking e-mail address */
     if ( empty ( $user->user_email ) ) {
-        $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ));
+        $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
     } else
         if (!is_email( $user->user_email ) ) {
-            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ));
+            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
         }