mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/13271' into prep-release-3.1.1

Browse Source 
* ticket/13271:
  [ticket/13271] Disable CC sender feature for anonymous users
This commit is contained in:
Nils Adermann 2014-11-02 00:22:58 +01:00
commit c980402a4c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/message/form.php
View File

@ -146,7 +146,7 @@ abstract class form
WHERE user_id = ' . $this->user->data['user_id']; WHERE user_id = ' . $this->user->data['user_id'];
$this->db->sql_query($sql); $this->db->sql_query($sql);
if ($this->cc_sender) if ($this->cc_sender && $this->user->data['is_registered'])
{ {
$this->message->cc_sender(); $this->message->cc_sender();
} }

2
phpBB/styles/prosilver/template/memberlist_email.html
View File

@ -77,10 +77,12 @@
<span>{L_EMAIL_BODY_EXPLAIN}</span></dt> <span>{L_EMAIL_BODY_EXPLAIN}</span></dt>
<dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd> <dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd>
</dl> </dl>
<!-- IF S_REGISTERED_USER -->
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd> <dd><label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label></dd>
</dl> </dl>
<!-- ENDIF -->
</fieldset> </fieldset>
</div> </div>

2
phpBB/styles/subsilver2/template/memberlist_email.html
View File

@ -66,6 +66,7 @@
<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td> <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_EMAIL_BODY_EXPLAIN}</span></td>
<td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td> <td class="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td>
</tr> </tr>
<!-- IF S_REGISTERED_USER -->
<tr> <tr>
<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td> <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td>
<td class="row2"> <td class="row2">
@ -77,6 +78,7 @@
</table> </table>
</td> </td>
</tr> </tr>
<!-- ENDIF -->
<tr> <tr>
<td class="cat" colspan="2" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td> <td class="cat" colspan="2" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td>
</tr> </tr>