5 files changed, 24 insertions, 5 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 4d80521e..55a525ba 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -308,7 +308,6 @@ 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);
-    $form->edit_user->password->rules("-required");
 
     module::event("user_edit_form_admin", $user, $form);
     $group->submit("")->value(t("Modify User"));
@@ -330,6 +329,10 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
     $form->add_rules_from(ORM::factory("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_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
     return $form;
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index b76a5e92..888fb37d 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -101,8 +101,9 @@ class Password_Controller extends Controller {
     if (!empty($hash)) {
       $hidden->value($hash);
     }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
+    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $input_password = $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
     $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
     $group->inputs["password2"]->error_messages(
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 28164e9c..3507ec6d 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -78,6 +78,11 @@ class Users_Controller extends Controller {
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $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", $user, $form);
     $group->submit("")->value(t("Save"));
     return $form;
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index cc8e71ea..9aad4130 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -80,7 +80,17 @@ class user_installer {
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
 
-    module::set_version("user", 1);
+    module::set_var("user", "mininum_password_length", 5);
+
+    module::set_version("user", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::set_var("user", "mininum_password_length", 5);
+
+      module::set_version("user", $version = 2);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/user/module.info b/modules/user/module.info
index 36a2179a..7178f108 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,6 +1,6 @@
 name = "Users and Groups"
 description = "Gallery 3 user and group management"
-version = 1
+version = 2
 
 ; Don't show this module on the module administration screen
 no_module_admin = 1