2 files changed, 23 insertions, 9 deletions

diff --git a/modules/user/controllers/admin_groups.php b/modules/user/controllers/admin_groups.php
index e5043e99..d0cfe70e 100644
--- a/modules/user/controllers/admin_groups.php
+++ b/modules/user/controllers/admin_groups.php
@@ -25,7 +25,7 @@ class Admin_Groups_Controller extends Controller {
     print $view;
   }
 
-  public function create() {
+  public function add() {
     rest::http_content_type(rest::JSON);
     $form = group::get_add_form_admin();
     if($form->validate()) {
@@ -40,7 +40,7 @@ class Admin_Groups_Controller extends Controller {
     }
   }
 
-  public function create_form() {
+  public function add_form() {
     print group::get_add_form_admin();
   }
   
@@ -51,8 +51,15 @@ class Admin_Groups_Controller extends Controller {
       kohana::show_404();
     }
 
-    $name = $group->name;
-    $group->delete();
+    $form = group::get_delete_form_admin($group);
+    if($form->validate()) {
+      $name = $group->name;
+      $group->delete();
+    } else {
+      message::error(_("Failed to delete group"));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
 
     log::success("group", sprintf(_("Deleted group %s"), $name));
     message::success(sprintf(_("Deleted group %s"), $name));
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 0d70231d..08618c8c 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -25,7 +25,7 @@ class Admin_Users_Controller extends Controller {
     print $view;
   }
 
-  public function create() {
+  public function add() {
     $form = user::get_add_form_admin();
     rest::http_content_type(rest::JSON);
     if($form->validate()) {
@@ -42,7 +42,7 @@ class Admin_Users_Controller extends Controller {
     }
   }
 
-  public function create_form() {
+  public function add_form() {
     print user::get_add_form_admin();
   }
     
@@ -53,8 +53,15 @@ class Admin_Users_Controller extends Controller {
       kohana::show_404();
     }
 
-    $name = $user->name;
-    $user->delete();
+    $form = user::get_delete_form_admin($user);
+    if($form->validate()) {
+      $name = $user->name;
+      $user->delete();
+    } else {
+      message::error(_("Failed to delete user"));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
 
     log::success("user", sprintf(_("Deleted user %s"), $name));
     message::success(sprintf(_("Deleted user %s"), $name));
@@ -79,7 +86,7 @@ class Admin_Users_Controller extends Controller {
     $form = user::get_edit_form_admin($user);
     $form->edit_user->password->rules("-required");
     if($form->validate()) {
-      $user->name = $form->edit_user->uname->value;
+      $user->name = $form->edit_user->inputs["name"]->value;
       $user->full_name = $form->edit_user->full_name->value;
       $user->password = $form->edit_user->password->value;
       $user->email = $form->edit_user->email->value;