diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-02-18 13:42:08 +0000 |
| commit | 5c6653717f0a9adce905d1417c8adb4f0f3a5b73 (patch) | |
| tree | c5e3b65b409ae33d52055e33cfed0ee169684023 /phpBB/includes/acp/acp_email.php | |
| parent | 652d349b75262dd8e0db8405d5ca1b7fa654364a (diff) | |
| download | forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.gz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.bz2 forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.xz forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.zip | |
fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic)
i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 57d03ff67e..3fbbe6472f 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -51,7 +51,7 @@ class acp_email $error[] = $user->lang['NO_EMAIL_MESSAGE']; } - if (!sizeof($error)) + if (!sizeof($error)) { if ($usernames) { @@ -208,16 +208,21 @@ class acp_email } } - // Exclude bots... + // Exclude bots and guests... $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " - WHERE group_name = 'BOTS'"; + WHERE group_name IN ('BOTS', 'GUESTS')"; $result = $db->sql_query($sql); - $bot_group_id = (int) $db->sql_fetchfield('group_id'); + + $exclude = array(); + while ($row = $db->sql_fetchrow($result)) + { + $exclude[] = $row['group_id']; + } $db->sql_freeresult($result); $select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>'; - $select_list .= group_select_options($group_id, array($bot_group_id)); + $select_list .= group_select_options($group_id, $exclude); $s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>'; $s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>'; |