diff options
| author | royalterra <royalterra@users.noreply.github.com> | 2015-12-11 09:39:01 +0000 |
|---|---|---|
| committer | royalterra <royalterra@users.noreply.github.com> | 2015-12-11 09:39:01 +0000 |
| commit | 4ff31d0a4140d923cbb8ddbe18ccf578a367375f (patch) | |
| tree | 1f63d4b042c3dbf7bfe2c3e74f0a24ef2e5f94ec /mod/mail.php | |
| parent | b92cc852d142940f0f8dd78ddf7be835dc8b9e07 (diff) | |
| parent | f73c82632f213ac7971b54220b4a0c87d354ca1e (diff) | |
| download | volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.tar.gz volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.tar.bz2 volse-hubzilla-4ff31d0a4140d923cbb8ddbe18ccf578a367375f.zip | |
Merge pull request #1 from redmatrix/master
merge branches
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mod/mail.php b/mod/mail.php index 536149a28..59d15772b 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -17,6 +17,7 @@ function mail_post(&$a) { $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); $recipient = ((x($_REQUEST,'messageto')) ? notags(trim($_REQUEST['messageto'])) : ''); $rstr = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : ''); + $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); // If we have a raw string for a recipient which hasn't been auto-filled, @@ -86,6 +87,13 @@ function mail_post(&$a) { require_once('include/text.php'); linkify_tags($a, $body, local_channel()); + if($preview) { + + + + + } + if(! $recipient) { notice('No recipient found.'); $a->argc = 2; @@ -329,7 +337,8 @@ function mail_content(&$a) { 'to_url' => chanlink_hash($message['to_xchan']), 'to_photo' => $message['to']['xchan_photo_s'], 'subject' => $message['title'], - 'body' => smilies(bbcode($message['body']) . $s), + 'body' => smilies(bbcode($message['body'])), + 'attachments' => $s, 'delete' => t('Delete message'), 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), |