notify coordinators about unconfirmed angeltypes

2 files changed, 36 insertions, 13 deletions

diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index 6b94545b..59e55a2d 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -85,9 +85,6 @@ function angeltype_delete_controller() {
 function angeltype_edit_controller() {
   global $privileges, $user;
   
-  if (! in_array('admin_angel_types', $privileges))
-    redirect(page_link_to('angeltypes'));
-  
   $name = "";
   $restricted = false;
   $description = "";
@@ -102,21 +99,32 @@ function angeltype_edit_controller() {
     $name = $angeltype['name'];
     $restricted = $angeltype['restricted'];
     $description = $angeltype['description'];
+    
+    if (! User_is_AngelType_coordinator($user, $angeltype))
+      redirect(page_link_to('angeltypes'));
+  } else {
+    if (! in_array('admin_angel_types', $privileges))
+      redirect(page_link_to('angeltypes'));
   }
   
+  // In coordinator mode only allow to modify description
+  $coordinator_mode = ! in_array('admin_angel_types', $privileges);
+  
   if (isset($_REQUEST['submit'])) {
     $ok = true;
     
-    if (isset($_REQUEST['name'])) {
-      list($valid, $name) = AngelType_validate_name($_REQUEST['name'], $angeltype);
-      if (! $valid) {
-        $ok = false;
-        error(_("Please check the name. Maybe it already exists."));
+    if (! $coordinator_mode) {
+      if (isset($_REQUEST['name'])) {
+        list($valid, $name) = AngelType_validate_name($_REQUEST['name'], $angeltype);
+        if (! $valid) {
+          $ok = false;
+          error(_("Please check the name. Maybe it already exists."));
+        }
       }
+      
+      $restricted = isset($_REQUEST['restricted']);
     }
     
-    $restricted = isset($_REQUEST['restricted']);
-    
     if (isset($_REQUEST['description']))
       $description = strip_request_item_nl('description');
     
@@ -142,7 +150,7 @@ function angeltype_edit_controller() {
   
   return array(
       isset($angeltype) ? sprintf(_("Edit %s"), $name) : _("Add new angeltype"),
-      AngelType_edit_view($name, $restricted, $description) 
+      AngelType_edit_view($name, $restricted, $description, $coordinator_mode) 
   );
 }
 
@@ -174,7 +182,7 @@ function angeltype_controller() {
   
   return array(
       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)) 
+      AngelType_view($angeltype, $members, $user_angeltype, in_array('admin_user_angeltypes', $privileges) || $user_angeltype['coordinator'], in_array('admin_angel_types', $privileges), $user_angeltype['coordinator']) 
   );
 }
 
diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index 095b35f5..cb8c72ae 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -1,6 +1,21 @@
 <?php
 
 /**
+ * Display a hint for team/angeltype coordinators if there are unconfirmed users for his angeltype.
+ */
+function user_angeltypes_unconfirmed_hint() {
+  global $user;
+  $unconfirmed_user_angeltypes = User_unconfirmed_AngelTypes($user);
+  if ($unconfirmed_user_angeltypes === false)
+    engelsystem_error("Unable to load user angeltypes.");
+  if (count($unconfirmed_user_angeltypes) == 0)
+    return '';
+  if ($_REQUEST['p'] == 'angeltypes' && $_REQUEST['action'] == 'view' && $_REQUEST['angeltype_id'] == $unconfirmed_user_angeltypes[0]['angeltype_id'])
+    return '';
+  return error(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . sprintf(_("The first wants to join %s."), '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $unconfirmed_user_angeltypes[0]['angeltype_id'] . '">' . $unconfirmed_user_angeltypes[0]['name'] . '</a>'), true);
+}
+
+/**
  * Remove all unconfirmed users from a specific angeltype.
  */
 function user_angeltypes_delete_all_controller() {
@@ -263,7 +278,7 @@ function user_angeltype_update_controller() {
   
   return array(
       $coordinator ? _("Add coordinator rights") : _("Remove coordinator rights"),
-      UserAngelType_update_view($user_angeltype, $user, $angeltype, $coordinator) 
+      UserAngelType_update_view($user_angeltype, $user_source, $angeltype, $coordinator) 
   );
 }