Implement UserPasswordMismatch exception

mantisbt · Dec 18, 2011 · 3cfb608 · 3cfb608
1 parent 495c709
commit 3cfb608
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/application/MantisBT/Exception/User/UserPasswordMismatch.php b/application/MantisBT/Exception/User/UserPasswordMismatch.php
@@ -0,0 +1,13 @@
+<?php
+namespace MantisBT\Exception\User;
+use MantisBT\Exception\ExceptionAbstract;
+
+require_api('lang_api.php');
+
+class UserPasswordMismatch extends ExceptionAbstract {
+	public function __construct() {
+		$errorMessage = lang_get(ERROR_USER_CREATE_PASSWORD_MISMATCH, null, false);
+		parent::__construct(ERROR_USER_CREATE_PASSWORD_MISMATCH, $errorMessage, null);
+		$this->responseCode = 400;
+	}
+}
diff --git a/public/account_update.php b/public/account_update.php
@@ -40,6 +40,8 @@
  * @uses utility_api.php
  */
 
+use MantisBT\Exception\User\UserPasswordMismatch;
+
 /**
  * MantisBT Core API's
  */
@@ -110,7 +112,7 @@
 # Update password if the two match and are not empty
 if ( !is_blank( $f_password ) ) {
 	if ( $f_password != $f_password_confirm ) {
-		trigger_error( ERROR_USER_CREATE_PASSWORD_MISMATCH, ERROR );
+		throw new UserPasswordMismatch();
 	} else {
 		if ( !auth_does_password_match( $t_user_id, $f_password ) ) {
 			user_set_password( $t_user_id, $f_password );

diff --git a/public/manage_user_create.php b/public/manage_user_create.php
@@ -38,6 +38,7 @@
  */
 
 use MantisBT\Exception\Field\EmptyField;
+use MantisBT\Exception\User\UserPasswordMismatch;
 
 require_once( 'core.php' );
 require_api( 'access_api.php' );
@@ -84,7 +85,7 @@
 user_ensure_realname_unique( $f_username, $f_realname );
 
 if ( $f_password != $f_password_verify ) {
-	trigger_error( ERROR_USER_CREATE_PASSWORD_MISMATCH, ERROR );
+	throw new UserPasswordMismatch();
 }
 
 $f_email = email_append_domain( $f_email );