Fix for ticket #201.

1) create common update function so processing consistent between the
user edit and admin edit.
2) created common private helper function to build the user edit form
the same way.
So a user can now change their user name if the new one doesn't exist.

1 files changed, 6 insertions, 15 deletions

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}")));