From 27b29afd7cf679f33429ce144871c1d96f137fbb Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 17 Apr 2010 12:26:52 -0700 Subject: Add user::valid_username() as a validation helper. --- modules/user/helpers/user.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/user/helpers/user.php') diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 650dcf6a..1ad4bbd2 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -76,6 +76,12 @@ class user_Core { } } + static function valid_username($text_input) { + if (!self::lookup_by_name($text_input->value)) { + $text_input->add_error("invalid_username", 1); + } + } + /** * Create the hashed passwords. * @param string $password a plaintext password -- cgit v1.2.3 From 6d81feacae8329cd0c65abe920ecd3fa2e8f2537 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 17 Apr 2010 12:28:46 -0700 Subject: Change the key for invalid passwords from "invalid" to "invalid_password" to remove ambiguity. --- modules/gallery/controllers/reauthenticate.php | 2 +- modules/user/controllers/users.php | 2 +- modules/user/helpers/user.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/user/helpers/user.php') diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php index b2a67f01..3503d80a 100644 --- a/modules/gallery/controllers/reauthenticate.php +++ b/modules/gallery/controllers/reauthenticate.php @@ -63,7 +63,7 @@ class Reauthenticate_Controller extends Controller { $group->password("password")->label(t("Password"))->id("g-password")->class(null) ->callback("auth::validate_too_many_failed_auth_attempts") ->callback("user::valid_password") - ->error_messages("invalid", t("Incorrect password")) + ->error_messages("invalid_password", t("Incorrect password")) ->error_messages( "too_many_failed_auth_attempts", t("Too many incorrect passwords. Try again later")); diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index e1f1fa2b..7f3f6b1f 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -167,7 +167,7 @@ class Users_Controller extends Controller { $group->password("old_password")->label(t("Old password"))->id("g-password") ->callback("auth::validate_too_many_failed_auth_attempts") ->callback("user::valid_password") - ->error_messages("invalid", t("Incorrect password")) + ->error_messages("invalid_password", t("Incorrect password")) ->error_messages( "too_many_failed_auth_attempts", t("Too many incorrect passwords. Try again later")); diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 1ad4bbd2..55153263 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -72,7 +72,7 @@ class user_Core { static function valid_password($password_input) { if (!user::is_correct_password(identity::active_user(), $password_input->value)) { - $password_input->add_error("invalid", 1); + $password_input->add_error("invalid_password", 1); } } -- cgit v1.2.3