summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/user/controllers/admin_groups.php15
-rw-r--r--modules/user/controllers/admin_users.php17
-rw-r--r--modules/user/helpers/group.php4
-rw-r--r--modules/user/helpers/user.php6
-rw-r--r--modules/user/views/admin_groups.html.php42
-rw-r--r--modules/user/views/admin_users.html.php10
6 files changed, 53 insertions, 41 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;
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 9ffa9929..ffd344f8 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -65,16 +65,14 @@ class group_Core {
$form = new Forge("admin/groups/edit/$group->id");
$form_group = $form->group("edit_group")->label(_("Edit Group"));
$form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
- $form_group->submit(_("Modify"));
$form->add_rules_from($group);
return $form;
}
public static function get_add_form_admin() {
- $form = new Forge("admin/groups/create");
+ $form = new Forge("admin/groups/add");
$form_group = $form->group("add_group")->label(_("Add Group"));
$form_group->input("name")->label(_("Name"))->id("gName");
- $form_group->submit(_("Create"));
$group = ORM::factory("group");
$form->add_rules_from($group);
return $form;
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f2912a0f..1da0b8cd 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -27,7 +27,7 @@ class user_Core {
public static function get_edit_form($user, $action = NULL) {
$form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
$group = $form->group("edit_user")->label(_("Edit User"));
- $group->input("uname")->label(_("Name"))->id("gName")->value($user->name);
+ $group->input("name")->label(_("Name"))->id("gName")->value($user->name);
$group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
$group->password("password")->label(_("Password"))->id("gPassword");
$group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
@@ -39,7 +39,7 @@ class user_Core {
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("name")->label(_("Name"))->id("gName")->value($user->name);
$group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
$group->password("password")->label(_("Password"))->id("gPassword");
$group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
@@ -48,7 +48,7 @@ class user_Core {
}
public static function get_add_form_admin() {
- $form = new Forge("admin/users/create");
+ $form = new Forge("admin/users/add");
$group = $form->group("add_user")->label(_("Add User"));
$group->input("name")->label(_("Name"))->id("gName");
$group->input("full_name")->label(_("Full Name"))->id("gFullName");
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index 17f350d2..bb7c231c 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -1,21 +1,21 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
-<div class="gBlock">
- <h2>Group Administration</h2>
- <div class="gBlockContent">
- <p>These are the groups in your system</p>
- </div>
- <ul>
- <? foreach ($groups as $i => $group): ?>
- <li>
- <?= $group->name ?>
- <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink">edit</a>
- <? if (!$group->special): ?>
- <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink">delete</a>
- <? endif ?>
- </li>
- <? endforeach ?>
- <li><a href="groups/create_form" class="gDialogLink">Add group</a></li>
- </ul>
-</div>
-
-
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div class="gBlock">
+ <h2><?= _("Group Administration") ?></h2>
+ <div class="gBlockContent">
+ <p><?= _("These are the groups in your system") ?></p>
+ </div>
+ <ul>
+ <? foreach ($groups as $i => $group): ?>
+ <li>
+ <?= $group->name ?>
+ <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"><?= _("edit") ?></a>
+ <? if (!$group->special): ?>
+ <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"><?= _("delete") ?></a>
+ <? endif ?>
+ </li>
+ <? endforeach ?>
+ <li><a href="groups/add_form" class="gDialogLink"><?= _("Add group") ?></a></li>
+ </ul>
+</div>
+
+
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index d32201f3..f3e6e139 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,20 +1,20 @@
<? defined("SYSPATH") or die("No direct script access."); ?>
<div class="gBlock">
- <h2>User Administration</h2>
+ <h2><?= _("User Administration") ?></h2>
<div class="gBlockContent">
- <p>These are the users in your system</p>
+ <p><?= _("These are the users in your system") ?></p>
<ul>
<? foreach ($users as $i => $user): ?>
<li>
<?= $user->name ?>
<?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?>
- <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink">edit</a>
+ <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= _("edit") ?></a>
<? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
- <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink">delete</a>
+ <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= _("delete") ?></a>
<? endif ?>
</li>
<? endforeach ?>
- <li><a href="users/create_form" class="gDialogLink">Add user</a></li>
+ <li><a href="users/add_form" class="gDialogLink"><?= _("Add user") ?></a></li>
</ul>
</div>
</div>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 13:20:52 +0000