diff options
| author | Philip Häusler <msquare@notrademark.de> | 2014-12-06 18:55:24 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2014-12-06 18:55:24 +0100 |
| commit | 10d7fce163ff28da68b036bd4fae95040fd170a9 (patch) | |
| tree | d49ac81632faf9dfadb8218a7b90f9ea752df4b1 /includes | |
| parent | 481e52cf77121e3230b16f6acf4ef675e8081671 (diff) | |
fix wrong angel type alarm
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/controller/user_angeltypes_controller.php | 10 | ||||
| -rw-r--r-- | includes/model/UserAngelTypes_model.php | 1 |
2 files changed, 8 insertions, 3 deletions
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)); } /** diff --git a/includes/model/UserAngelTypes_model.php b/includes/model/UserAngelTypes_model.php index 4a25d25a..7dcaef7a 100644 --- a/includes/model/UserAngelTypes_model.php +++ b/includes/model/UserAngelTypes_model.php @@ -23,6 +23,7 @@ function User_unconfirmed_AngelTypes($user) { 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"); } |