diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-10-21 15:46:23 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-10-21 15:46:23 +0000 |
| commit | 7470dcf709c7b0e9957414af6cacc9f99e61932b (patch) | |
| tree | 07e1c190477612b4a1e35f46fafa4e6590bb9cc9 /phpBB/includes | |
| parent | 1df3ccc836a6394c2ddae3c058247b074e4b1343 (diff) | |
| download | forums-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar forums-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar.gz forums-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar.bz2 forums-7470dcf709c7b0e9957414af6cacc9f99e61932b.tar.xz forums-7470dcf709c7b0e9957414af6cacc9f99e61932b.zip | |
Move outputting of TO box since it's only relevant to one module and this will ensure it is displayed however that module is loaded [#4866]
git-svn-id: file:///svn/phpbb/trunk@6515 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 8f0c3e280d..6c20c89459 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -66,6 +66,34 @@ function compose_pm($id, $mode, $action) redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm')); } + // Output PM_TO box if message composing + if ($action != 'edit') + { + if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) + { + $sql = 'SELECT group_id, group_name, group_type + FROM ' . GROUPS_TABLE . ' + WHERE group_type NOT IN (' . GROUP_HIDDEN . ', ' . GROUP_CLOSED . ') + AND group_receive_pm = 1 + ORDER BY group_type DESC'; + $result = $db->sql_query($sql); + + $group_options = ''; + while ($row = $db->sql_fetchrow($result)) + { + $group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; + } + $db->sql_freeresult($result); + } + + $template->assign_vars(array( + 'S_SHOW_PM_BOX' => true, + 'S_ALLOW_MASS_PM' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false, + 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '', + 'U_SEARCH_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=post&field=username_list')) + ); + } + $sql = ''; // What is all this following SQL for? Well, we need to know |