stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-19 19:09:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

User/Group administration cleanup

Browse Source
This commit is contained in:
Felix Rabinovich
2008-12-26 06:14:24 +00:00
parent 4dda9c5a6e
commit 6dcc3e5c25
6 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/user/controllers/admin_users.php
View File

@@ -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;