2 files changed, 30 insertions, 18 deletions

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 5b438de9..ea3a4c8b 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -21,25 +21,31 @@ class Users_Controller extends REST_Controller {
   protected $resource_type = "user";
 
   /**
-   * Present a form for editing a user
-   *  @see Rest_Controller::form($resource)
+   * Display comments based on criteria.
+   *  @see Rest_Controller::_delete($resource)
    */
-  public function _form($user) {
-    $form = user::get_edit_form($user);
-    print $form;
+  public function _index($query) {
+    throw new Exception("@todo Comment_Controller::_index NOT IMPLEMENTED");
+  }
+
+  /**
+   *  @see Rest_Controller::_create($resource)
+   */
+  public function _create($user) {
+    throw new Exception("@todo User_Controller::_create NOT IMPLEMENTED");
   }
 
   /**
-   * @see Rest_Controller::_get($resource, $format)
+   * @see Rest_Controller::_show($resource, $format)
    */
-  public function _get($user, $format) {
-    throw new Exception("@todo User_Controller::_get NOT IMPLEMENTED");
+  public function _show($user, $format) {
+    throw new Exception("@todo User_Controller::_show NOT IMPLEMENTED");
   }
 
   /**
-   *  @see Rest_Controller::_put($resource)
+   *  @see Rest_Controller::_update($resource)
    */
-  public function _put($user) {
+  public function _update($user) {
     $form = user::get_edit_form($user);
     if ($form->validate()) {
       foreach ($form->as_array() as $key => $value) {
@@ -55,16 +61,22 @@ class Users_Controller extends REST_Controller {
   }
 
   /**
-   *  @see Rest_Controller::_post($resource)
+   *  @see Rest_Controller::_delete($resource)
    */
-  public function _post($user) {
-    throw new Exception("@todo User_Controller::_post NOT IMPLEMENTED");
+  public function _delete($user) {
+    throw new Exception("@todo User_Controller::_delete NOT IMPLEMENTED");
   }
 
   /**
-   *  @see Rest_Controller::_delete($resource)
+   * Present a form for editing a user
+   *  @see Rest_Controller::form($resource)
    */
-  public function _delete($user) {
-    throw new Exception("@todo User_Controller::_delete NOT IMPLEMENTED");
+  public function _form($user, $form_type) {
+    if ($form_type == "edit") {
+      $form = user::get_edit_form($user);
+      print $form;
+    } else {
+      return Kohana::show_404();
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 01438e6e..b424a3ad 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -31,7 +31,7 @@ class user {
    */
   public static function get_edit_form($user) {
     $form = new Forge(
-      url::site("user/{$user->id}?_method=put"), "", "post", array("id" => "gUserForm"));
+      url::site("users/{$user->id}?_method=put"), "", "post", array("id" => "gUserForm"));
     $group = $form->group(_("User Info"));
     $group->input("name")         ->label(_("Name"))         ->id("gName")        ->value($user->name);
     $group->input("display_name") ->label(_("Display Name")) ->id("gDisplayName") ->value($user->display_name);