From d71e7bbfad2f07f82df0c515608996d250fd4182 Mon Sep 17 00:00:00 2001 From: Bot Date: Mon, 2 Jan 2017 15:43:36 +0100 Subject: Formatting --- includes/controller/angeltypes_controller.php | 179 +++++++++++++++----------- 1 file changed, 102 insertions(+), 77 deletions(-) (limited to 'includes/controller/angeltypes_controller.php') diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php index 26aaae71..de4b8a49 100644 --- a/includes/controller/angeltypes_controller.php +++ b/includes/controller/angeltypes_controller.php @@ -14,20 +14,20 @@ function angeltypes_title() function angeltypes_controller() { $action = strip_request_item('action', 'list'); - + switch ($action) { - default: - case 'list': - return angeltypes_list_controller(); - case 'view': - return angeltype_controller(); - case 'edit': - return angeltype_edit_controller(); - case 'delete': - return angeltype_delete_controller(); - case 'about': - return angeltypes_about_controller(); - } + default: + case 'list': + return angeltypes_list_controller(); + case 'view': + return angeltype_controller(); + case 'edit': + return angeltype_edit_controller(); + case 'delete': + return angeltype_delete_controller(); + case 'about': + return angeltypes_about_controller(); + } } /** @@ -46,17 +46,17 @@ function angeltype_link($angeltype_id) function angeltypes_about_controller() { global $user; - + if (isset($user)) { $angeltypes = AngelTypes_with_user($user); } else { $angeltypes = AngelTypes(); } - + return [ - _("Teams/Job description"), - AngelTypes_about_view($angeltypes, isset($user)) - ]; + _("Teams/Job description"), + AngelTypes_about_view($angeltypes, isset($user)) + ]; } /** @@ -65,23 +65,23 @@ function angeltypes_about_controller() function angeltype_delete_controller() { global $privileges; - - if (! in_array('admin_angel_types', $privileges)) { + + if (!in_array('admin_angel_types', $privileges)) { redirect(page_link_to('angeltypes')); } - + $angeltype = load_angeltype(); - + if (isset($_REQUEST['confirmed'])) { AngelType_delete($angeltype); success(sprintf(_("Angeltype %s deleted."), AngelType_name_render($angeltype))); redirect(page_link_to('angeltypes')); } - + return [ - sprintf(_("Delete angeltype %s"), $angeltype['name']), - AngelType_delete_view($angeltype) - ]; + sprintf(_("Delete angeltype %s"), $angeltype['name']), + AngelType_delete_view($angeltype) + ]; } /** @@ -90,63 +90,63 @@ function angeltype_delete_controller() function angeltype_edit_controller() { global $privileges, $user; - - // In supporter mode only allow to modify description - $supporter_mode = ! in_array('admin_angel_types', $privileges); - + + // In supporter mode only allow to modify description + $supporter_mode = !in_array('admin_angel_types', $privileges); + if (isset($_REQUEST['angeltype_id'])) { // Edit existing angeltype - $angeltype = load_angeltype(); - - if (! User_is_AngelType_supporter($user, $angeltype)) { + $angeltype = load_angeltype(); + + if (!User_is_AngelType_supporter($user, $angeltype)) { redirect(page_link_to('angeltypes')); } } else { // New angeltype - if ($supporter_mode) { - // Supporters aren't allowed to create new angeltypes. - redirect(page_link_to('angeltypes')); - } + if ($supporter_mode) { + // Supporters aren't allowed to create new angeltypes. + redirect(page_link_to('angeltypes')); + } $angeltype = AngelType_new(); } - + if (isset($_REQUEST['submit'])) { $valid = true; - - if (! $supporter_mode) { + + if (!$supporter_mode) { if (isset($_REQUEST['name'])) { $result = AngelType_validate_name($_REQUEST['name'], $angeltype); $angeltype['name'] = $result->getValue(); - if (! $result->isValid()) { + if (!$result->isValid()) { $valid = false; error(_("Please check the name. Maybe it already exists.")); } } - + $angeltype['restricted'] = isset($_REQUEST['restricted']); $angeltype['no_self_signup'] = isset($_REQUEST['no_self_signup']); $angeltype['requires_driver_license'] = isset($_REQUEST['requires_driver_license']); } - + $angeltype['description'] = strip_request_item_nl('description', $angeltype['description']); - + if ($valid) { if ($angeltype['id'] != null) { AngelType_update($angeltype); } else { $angeltype = AngelType_create($angeltype); } - + success("Angel type saved."); redirect(angeltype_link($angeltype['id'])); } } - + return [ - sprintf(_("Edit %s"), $angeltype['name']), - AngelType_edit_view($angeltype, $supporter_mode) - ]; + sprintf(_("Edit %s"), $angeltype['name']), + AngelType_edit_view($angeltype, $supporter_mode) + ]; } /** @@ -155,20 +155,29 @@ function angeltype_edit_controller() function angeltype_controller() { global $privileges, $user; - - if (! in_array('angeltypes', $privileges)) { + + if (!in_array('angeltypes', $privileges)) { redirect('?'); } - + $angeltype = load_angeltype(); $user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype); $user_driver_license = UserDriverLicense($user['UID']); $members = Users_by_angeltype($angeltype); - + return [ - sprintf(_("Team %s"), $angeltype['name']), - AngelType_view($angeltype, $members, $user_angeltype, in_array('admin_user_angeltypes', $privileges) || $user_angeltype['supporter'], in_array('admin_angel_types', $privileges), $user_angeltype['supporter'], $user_driver_license, $user) - ]; + sprintf(_("Team %s"), $angeltype['name']), + AngelType_view( + $angeltype, + $members, + $user_angeltype, + in_array('admin_user_angeltypes', $privileges) || $user_angeltype['supporter'], + in_array('admin_angel_types', $privileges), + $user_angeltype['supporter'], + $user_driver_license, + $user + ) + ]; } /** @@ -177,42 +186,58 @@ function angeltype_controller() function angeltypes_list_controller() { global $privileges, $user; - - if (! in_array('angeltypes', $privileges)) { + + if (!in_array('angeltypes', $privileges)) { redirect('?'); } - + $angeltypes = AngelTypes_with_user($user); - + foreach ($angeltypes as &$angeltype) { $actions = [ - button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], _("view"), "btn-xs") - ]; - + button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], _("view"), "btn-xs") + ]; + if (in_array('admin_angel_types', $privileges)) { - $actions[] = button(page_link_to('angeltypes') . '&action=edit&angeltype_id=' . $angeltype['id'], _("edit"), "btn-xs"); - $actions[] = button(page_link_to('angeltypes') . '&action=delete&angeltype_id=' . $angeltype['id'], _("delete"), "btn-xs"); + $actions[] = button( + page_link_to('angeltypes') . '&action=edit&angeltype_id=' . $angeltype['id'], + _("edit"), + "btn-xs" + ); + $actions[] = button( + page_link_to('angeltypes') . '&action=delete&angeltype_id=' . $angeltype['id'], + _("delete"), + "btn-xs" + ); } - + $angeltype['membership'] = AngelType_render_membership($angeltype); if ($angeltype['user_angeltype_id'] != null) { - $actions[] = button(page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $angeltype['user_angeltype_id'], _("leave"), "btn-xs"); + $actions[] = button( + page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $angeltype['user_angeltype_id'], + _("leave"), + "btn-xs" + ); } else { - $actions[] = button(page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'], _("join"), "btn-xs"); + $actions[] = button( + page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'], + _("join"), + "btn-xs" + ); } - + $angeltype['restricted'] = $angeltype['restricted'] ? glyph('lock') : ''; $angeltype['no_self_signup'] = $angeltype['no_self_signup'] ? '' : glyph('share'); $angeltype['name'] = '' . $angeltype['name'] . ''; - + $angeltype['actions'] = table_buttons($actions); } - + return [ - angeltypes_title(), - AngelTypes_list_view($angeltypes, in_array('admin_angel_types', $privileges)) - ]; + angeltypes_title(), + AngelTypes_list_view($angeltypes, in_array('admin_angel_types', $privileges)) + ]; } /** @@ -220,15 +245,15 @@ function angeltypes_list_controller() */ function load_angeltype() { - if (! isset($_REQUEST['angeltype_id'])) { + if (!isset($_REQUEST['angeltype_id'])) { redirect(page_link_to('angeltypes')); } - + $angeltype = AngelType($_REQUEST['angeltype_id']); if ($angeltype == null) { error(_("Angeltype doesn't exist.")); redirect(page_link_to('angeltypes')); } - + return $angeltype; } -- cgit v1.2.3-54-g00ecf