3 files changed, 23 insertions, 27 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 71978e3b..22801c95 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -27,28 +27,23 @@ class Admin_Users_Controller extends Controller {
   }
 
   public function create() {
-    rest::http_content_type(rest::JSON);
     $form = user::get_add_form_admin();
-    if ($form->validate()) {
-      $user = user::create($form->add_user->inputs["name"]->value,
-                           $form->add_user->full_name->value, $form->add_user->password->value);
-      $user->email = $form->add_user->email->value;
-      $user->save();
-      log::success("user", sprintf(_("Created user %s"), $user->name));
-      message::success(sprintf(_("Created user %s"), $user->name));
-      $output = '<li>' . $user->name . ' <a href="#">edit</a><div>' .
-        user::get_edit_form_admin($user) . '</div><a href="#">delete</a><div>' .
-        user::get_delete_form_admin($user, "admin/users/delete/{$user->id}") .
-        '</div></li>';
-      print json_encode(
-        array("result" => "success", "operation" => "create",
-              "output" => $output,
-              "form" => user::get_add_form_admin()));
+    if (request::method() =="post" ) {
+      if($form->validate()) {
+        $user = user::create($form->add_user->inputs["name"]->value,
+                             $form->add_user->full_name->value, $form->add_user->password->value);
+        $user->email = $form->add_user->email->value;
+        $user->save();
+        message::success(sprintf(_("Created user %s"), $user->name));
+        print json_encode(array("result" => "success"));
+      } else {
+        message::error(_("Failed to create user"));
+        print json_encode(array("result" => "error",
+                                "form" => $form->__toString()));
+      }
     } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
+      print $form;
+    }    
   }
 
   public function delete($id) {
@@ -65,7 +60,7 @@ class Admin_Users_Controller extends Controller {
       message::success(sprintf(_("Deleted user %s"), $name));
       print json_encode(array("result" => "success"));
     } else {
-      print user::get_delete_form_admin($user, "admin/users/delete/$id");
+      print user::get_delete_form_admin($user);
     }
 
   }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 584bc72f..35a7e24e 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -36,8 +36,8 @@ class user_Core {
     return $form;
   }
 
-  public static function get_edit_form_admin($user, $action = NULL) {
-    $form = new Forge("admin/users/edit/$user->id", "", "post", array("id" => "gUserForm"));
+  public static function get_edit_form_admin($user) {
+    $form = new Forge("admin/users/edit/$user->id");
     $group = $form->group("edit_user")->label(_("Edit User"));
     $group->input("uname")->label(_("Name"))->id("gName")->value($user->name);
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
@@ -47,7 +47,7 @@ class user_Core {
     return $form;
   }
 
-  public static function get_add_form_admin($action = NULL) {
+  public static function get_add_form_admin() {
     $form = new Forge("admin/users/create");
     $group = $form->group("add_user")->label(_("Add User"));
     $group->input("name")->label(_("Name"))->id("gName");
@@ -60,8 +60,9 @@ class user_Core {
     return $form;
   }
 
-  public static function get_delete_form_admin($user, $action = NULL) {
-    $form = new Forge($action, sprintf(_("Are you sure you want to delete %s"), $user->name));
+  public static function get_delete_form_admin($user) {
+    $form = new Forge("admin/users/delete/$user->id",
+                      sprintf(_("Are you sure you want to delete %s"), $user->name));
     return $form->render("admin_users_delete.html");
   }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 55d6d61c..45ba6598 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -14,7 +14,7 @@
         <? endif ?>
       </li>
       <? endforeach ?>
-      <li><a href="users/add/<?= $user->id ?>" class="gDialogLink">Add user</a></li>
+      <li><a href="users/create" class="gDialogLink">Add user</a></li>
     </ul>
   </div>
 </div>