diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-01 18:10:25 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-02 00:21:23 +0100 |
| commit | 27be69e3b3092def847d497c19bad7d4ad0a33d8 (patch) | |
| tree | 4a6c46695a4b1cb540b803025ca6dc502650f5fe | |
| parent | 197fed16bd0fed828dabc433dac6e99028231556 (diff) | |
| download | forums-27be69e3b3092def847d497c19bad7d4ad0a33d8.tar forums-27be69e3b3092def847d497c19bad7d4ad0a33d8.tar.gz forums-27be69e3b3092def847d497c19bad7d4ad0a33d8.tar.bz2 forums-27be69e3b3092def847d497c19bad7d4ad0a33d8.tar.xz forums-27be69e3b3092def847d497c19bad7d4ad0a33d8.zip | |
[ticket/13271] Disable CC sender feature for anonymous users
PHPBB3-13271
| -rw-r--r-- | phpBB/phpbb/message/form.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_email.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/memberlist_email.html | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/message/form.php b/phpBB/phpbb/message/form.php index 076b41dc07..21d4de0b4d 100644 --- a/phpBB/phpbb/message/form.php +++ b/phpBB/phpbb/message/form.php @@ -146,7 +146,7 @@ abstract class form WHERE user_id = ' . $this->user->data['user_id']; $this->db->sql_query($sql); - if ($this->cc_sender) + if ($this->cc_sender && $this->user->data['is_registered']) { $this->message->cc_sender(); } diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 865f0b883c..e848844093 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -77,10 +77,12 @@ <span>{L_EMAIL_BODY_EXPLAIN}</span></dt> <dd><textarea class="inputbox" name="message" id="message" rows="15" cols="76" tabindex="4">{MESSAGE}</textarea></dd> </dl> + <!-- IF S_REGISTERED_USER --> <dl> <dt> </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> </dl> + <!-- ENDIF --> </fieldset> </div> diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html index 13ff4baace..b52513c241 100644 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ b/phpBB/styles/subsilver2/template/memberlist_email.html @@ -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="row2"><textarea class="post" name="message" rows="15" cols="76" tabindex="3">{MESSAGE}</textarea></td> </tr> + <!-- IF S_REGISTERED_USER --> <tr> <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span></td> <td class="row2"> @@ -77,6 +78,7 @@ </table> </td> </tr> + <!-- ENDIF --> <tr> <td class="cat" colspan="2" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td> </tr> |