show number of user angel types to confirm in hint

2 files changed, 10 insertions, 6 deletions

diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index 66abc589..f76f10ae 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -14,7 +14,7 @@ function user_angeltypes_unconfirmed_hint() {
   
   $unconfirmed_links = [];
   foreach ($unconfirmed_user_angeltypes as $user_angeltype)
-    $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . '</a>';
+    $unconfirmed_links[] = '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $user_angeltype['angeltype_id'] . '">' . $user_angeltype['name'] . ' (+' . $user_angeltype['count'] . ')' . '</a>';
   
   return info(sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.", count($unconfirmed_user_angeltypes)), count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ', $unconfirmed_links), true);
 }
diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php
index fccabd96..b2ebd9fe 100644
--- a/includes/model/UserAngelTypes_model.php
+++ b/includes/model/UserAngelTypes_model.php
@@ -19,14 +19,18 @@ function User_angeltypes($user) {
  */
 function User_unconfirmed_AngelTypes($user) {
   return sql_select("
-    SELECT `UserAngelTypes`.*, `AngelTypes`.`name` FROM `UserAngelTypes`
+    SELECT 
+      `UserAngelTypes`.*, 
+      `AngelTypes`.`name`, 
+      count(`UnconfirmedMembers`.`user_id`) as `count` 
+    FROM `UserAngelTypes`
     JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id`
     JOIN `UserAngelTypes` as `UnconfirmedMembers` ON `UserAngelTypes`.`angeltype_id`=`UnconfirmedMembers`.`angeltype_id`
     WHERE `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "'
-    AND `UserAngelTypes`.`coordinator`=TRUE
-    AND `AngelTypes`.`restricted`=TRUE
-    AND `UnconfirmedMembers`.`confirm_user_id` IS NULL
-    GROUP BY `UserAngelTypes`.`user_id`
+      AND `UserAngelTypes`.`coordinator`=TRUE
+      AND `AngelTypes`.`restricted`=TRUE
+      AND `UnconfirmedMembers`.`confirm_user_id` IS NULL
+    GROUP BY `UserAngelTypes`.`angeltype_id`
     ORDER BY `AngelTypes`.`name`");
 }