Multiple and single recepients now work properly

git-svn-id: file:///svn/phpbb/trunk@6866 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Dominik Dröscher 2007-01-09 14:32:34 +00:00
parent 2b35b9d60d
commit 11300e3ceb
2 changed files with 9 additions and 8 deletions

View file

@ -52,6 +52,7 @@ function compose_pm($id, $mode, $action)
|| $remove_u || $remove_g || $add_to || $add_bcc;
$action = ($delete && !$preview && !$refresh && $submit) ? 'delete' : $action;
$select_single = ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? false : true;
$error = array();
$current_time = time();
@ -90,8 +91,8 @@ function compose_pm($id, $mode, $action)
'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_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=post&field=username&select_single=true'),
'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=post&field=username&select_single=true', true))
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=post&field=username_list&select_single=$select_single"),
'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=post&field=username_list&select_single=$select_single", true))
);
}

View file

@ -13,21 +13,21 @@
<tr>
<th>{L_PM_TO}</th>
</tr>
<!-- IF not S_ALLOW_MASS_PM -->
<tr>
<td class="row1"><b class="genmed">{L_USERNAME}:</b><br />[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a> ]</td>
</tr>
<tr>
<td class="row2"><input class="post" type="text" name="username" size="20" maxlength="40" value="" />&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD}" /></td>
<td class="row2"><input class="post" type="text" name="username_list" size="20" maxlength="40" value="" />&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD}" /></td>
</tr>
<!-- IF S_ALLOW_MASS_PM -->
<!-- ELSE -->
<tr>
<td class="row1"><b class="genmed">{L_USERNAMES}:</b></td>
</tr>
<tr>
<td class="row2"><input name="username" value="" /><br />
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<li>&#187; <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a></li>
</ul>
<td class="row2"><textarea name="username_list" rows="5" cols="22"></textarea><br />
[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false">{L_FIND_USERNAME}</a> ]
</td>
</tr>
<!-- ENDIF -->