1 files changed, 6 insertions, 32 deletions

diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index cb2bb2fb..548cf3e7 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -50,9 +50,6 @@ function angeltypes_about_controller() {
   } else {
     $angeltypes = AngelTypes();
   }
-  if ($angeltypes === false) {
-    engelsystem_error("Unable to load angeltypes.");
-  }
   
   return [
       _("Teams/Job description"),
@@ -71,9 +68,6 @@ function angeltype_delete_controller() {
   }
   
   $angeltype = AngelType($_REQUEST['angeltype_id']);
-  if ($angeltype === false) {
-    engelsystem_error("Unable to load angeltype.");
-  }
   if ($angeltype == null) {
     redirect(page_link_to('angeltypes'));
   }
@@ -109,9 +103,6 @@ function angeltype_edit_controller() {
   
   if (isset($_REQUEST['angeltype_id'])) {
     $angeltype = AngelType($_REQUEST['angeltype_id']);
-    if ($angeltype === false) {
-      engelsystem_error("Unable to load angeltype.");
-    }
     if ($angeltype == null) {
       redirect(page_link_to('angeltypes'));
     }
@@ -121,7 +112,7 @@ function angeltype_edit_controller() {
     $description = $angeltype['description'];
     $requires_driver_license = $angeltype['requires_driver_license'];
     
-    if (! User_is_AngelType_coordinator($user, $angeltype)) {
+    if (! User_is_AngelType_supporter($user, $angeltype)) {
       redirect(page_link_to('angeltypes'));
     }
   } else {
@@ -130,13 +121,13 @@ function angeltype_edit_controller() {
     }
   }
   
-  // In coordinator mode only allow to modify description
-  $coordinator_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['submit'])) {
     $valid = true;
     
-    if (! $coordinator_mode) {
+    if (! $supporter_mode) {
       if (isset($_REQUEST['name'])) {
         $result = AngelType_validate_name($_REQUEST['name'], $angeltype);
         $name = $result->getValue();
@@ -177,7 +168,7 @@ function angeltype_edit_controller() {
   
   return [
       sprintf(_("Edit %s"), $name),
-      AngelType_edit_view($name, $restricted, $description, $coordinator_mode, $requires_driver_license) 
+      AngelType_edit_view($name, $restricted, $description, $supporter_mode, $requires_driver_license) 
   ];
 }
 
@@ -196,23 +187,12 @@ function angeltype_controller() {
   }
   
   $angeltype = AngelType($_REQUEST['angeltype_id']);
-  if ($angeltype === false) {
-    engelsystem_error("Unable to load angeltype.");
-  }
   if ($angeltype == null) {
     redirect(page_link_to('angeltypes'));
   }
   
   $user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
-  if ($user_angeltype === false) {
-    engelsystem_error("Unable to load user angeltype.");
-  }
-  
   $user_driver_license = UserDriverLicense($user['UID']);
-  if ($user_driver_license === false) {
-    engelsystem_error("Unable to load user driver license.");
-  }
-  
   $members = Users_by_angeltype($angeltype);
   if ($members === false) {
     engelsystem_error("Unable to load members.");
@@ -220,7 +200,7 @@ function angeltype_controller() {
   
   return [
       sprintf(_("Team %s"), $angeltype['name']),
-      AngelType_view($angeltype, $members, $user_angeltype, in_array('admin_user_angeltypes', $privileges) || $user_angeltype['coordinator'], in_array('admin_angel_types', $privileges), $user_angeltype['coordinator'], $user_driver_license, $user) 
+      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) 
   ];
 }
 
@@ -235,9 +215,6 @@ function angeltypes_list_controller() {
   }
   
   $angeltypes = AngelTypes_with_user($user);
-  if ($angeltypes === false) {
-    engelsystem_error("Unable to load angeltypes.");
-  }
   
   foreach ($angeltypes as &$angeltype) {
     $actions = [
@@ -277,9 +254,6 @@ function load_angeltype() {
   }
   
   $angeltype = AngelType($_REQUEST['angeltype_id']);
-  if ($angeltype === false) {
-    engelsystem_error("Unable to load angeltype.");
-  }
   if ($angeltype == null) {
     error(_("Angeltype doesn't exist."));
     redirect(page_link_to('angeltypes'));