diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/welcome.php | 21 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 29 |
2 files changed, 44 insertions, 6 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index f2bc5699..08bfcb56 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -394,8 +394,8 @@ class Welcome_Controller extends Template_Controller { url::redirect("welcome"); } - public function delete_user($name) { - user::delete($name); + public function delete_user($id) { + user::delete($id); url::redirect("welcome"); } @@ -405,9 +405,22 @@ class Welcome_Controller extends Template_Controller { url::redirect("welcome"); } - public function delete_group($name) { - group::delete($name); + public function delete_group($id) { + group::delete($id); url::redirect("welcome"); } + public function remove_from_group($group_id, $user_id) { + group::remove_user($group_id, $user_id); + url::redirect("welcome"); + } + + public function add_to_group($user_id) { + $group_name = $this->input->post("group_name"); + $group = ORM::factory("group")->where("name", $group_name)->find(); + if ($group->loaded) { + group::add_user($group->id, $user_id); + } + url::redirect("welcome"); + } } diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index 7fc006b0..8a397f4b 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -252,7 +252,27 @@ <div id="access_users" class="activity"> <ul> <? foreach ($users as $user): ?> - <li> <?= $user->name ?> <?= html::anchor("welcome/delete_user/$user->name", "[x]") ?></li> + <li> + <?= $user->name ?> + <? if ($user->id != user::ADMIN): ?> + <?= html::anchor("welcome/delete_user/$user->id", "[x]") ?> + <? endif ?> + <ul> + <? foreach ($user->groups as $group): ?> + <li> + <?= $group->name ?> + <? if ($group->id != group::REGISTERED_USERS): ?> + <?= html::anchor("welcome/remove_from_group/$group->id/$user->id", "[x]") ?> + <? endif ?> + </li> + <? endforeach ?> + <li> + <form method="post" action="<?= url::site("welcome/add_to_group/$user->id") ?>"> + <input type="text" name="group_name"/> + </form> + </li> + </ul> + </li> <? endforeach ?> </ul> <fieldset> @@ -267,7 +287,12 @@ <div id="access_groups" class="activity"> <ul> <? foreach ($groups as $group): ?> - <li> <?= $group->name ?> <?= html::anchor("welcome/delete_group/$group->name", "[x]") ?></li> + <li> + <?= $group->name ?> + <? if ($group->id != group::REGISTERED_USERS): ?> + <?= html::anchor("welcome/delete_group/$group->id", "[x]") ?> + <? endif ?> + </li> <? endforeach ?> </ul> <fieldset> |