2 files changed, 7 insertions, 33 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 4f3ea65a..70a5c417 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -96,28 +96,12 @@ class Admin_Users_Controller extends Controller {
     }
 
     $form = user::get_edit_form_admin($user);
-    $form->edit_user->password->rules("-required");
     $valid = $form->validate();
     if ($valid) {
-      $new_name = $form->edit_user->inputs["name"]->value;
-      if (ORM::factory("user")
-          ->where("name", $new_name)
-          ->where("id !=", $id)
-          ->find()
-          ->loaded) {
-        $form->edit_user->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
+      $valid = user::update($user, $form);
     }
 
     if ($valid) {
-      $user->name = $new_name;
-      $user->full_name = $form->edit_user->full_name->value;
-      $user->password = $form->edit_user->password->value;
-      $user->email = $form->edit_user->email->value;
-      $desired_locale = $form->edit_user->locale->value;
-      $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      $user->save();
       message::success(t("Changed user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
@@ -159,7 +143,6 @@ class Admin_Users_Controller extends Controller {
 
   public function add_group() {
     access::verify_csrf();
-    $form = group::get_add_form_admin();
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->add_group->inputs["name"]->value;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index eb49b5b1..55970ded 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -26,21 +26,12 @@ class Users_Controller extends REST_Controller {
     }
 
     $form = user::get_edit_form($user);
-    $form->edit_user->password->rules("-required");
-    if ($form->validate()) {
-      // @todo: allow the user to change their name
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-      $user->save();
-      
+    $valid = $form->validate();
+    if ($valid) {
+      $valid = user::update($user, $form);
+    }
+
+    if ($valid) {
       print json_encode(
         array("result" => "success",
               "resource" => url::site("users/{$user->id}")));