diff options
Diffstat (limited to 'includes/controller')
| -rw-r--r-- | includes/controller/api.php | 2 | ||||
| -rw-r--r-- | includes/controller/user_angeltypes_controller.php | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/includes/controller/api.php b/includes/controller/api.php index 4403b984..9ecd3a2f 100644 --- a/includes/controller/api.php +++ b/includes/controller/api.php @@ -63,7 +63,7 @@ getUser id (integer) - User ID Return Example: [{"UID":"1"},{"UID":"23"},{"UID":"42"}] - {"UID":"1","Nick":"admin","Name":"Gates","Vorname":"Bill","Telefon":"","DECT":"","Handy":"","email":"","ICQ":"","jabber":"","Avatar":"115"} + {"UID":"1","Nick":"admin","Name":"Gates","Vorname":"Bill","Telefon":"","DECT":"","Handy":"","email":"","jabber":"","Avatar":"115"} getShift Description: diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index e4c7676f..049d6211 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -5,14 +5,18 @@ */ 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>')); + + $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>'; + + return error(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)); } /** |