diff options
Diffstat (limited to 'modules/user/controllers')
| -rw-r--r-- | modules/user/controllers/admin_users.php | 5 | ||||
| -rw-r--r-- | modules/user/controllers/users.php | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index ac5dc33c..269e3dc8 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -311,6 +311,9 @@ class Admin_Users_Controller extends Admin_Controller { $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin); $form->add_rules_from($user); + $minimum_length = module::get_var("user", "mininum_password_length", 5); + $form->edit_user->password + ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]"); module::event("user_edit_form_admin", $user, $form); $group->submit("")->value(t("Modify User")); @@ -334,7 +337,7 @@ class Admin_Users_Controller extends Admin_Controller { $minimum_length = module::get_var("user", "mininum_password_length", 5); $form->add_user->password - ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]"); + ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]"); module::event("user_add_form_admin", $user, $form); $group->submit("")->value(t("Add User")); diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index 7bcc74d7..ca218393 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -84,7 +84,6 @@ class Users_Controller extends Controller { $form->edit_user->password ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]"); - module::event("user_edit_form", $user, $form); $group->submit("")->value(t("Save")); return $form; |