aboutsummaryrefslogtreecommitdiffstats
path: root/include/message.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-25 21:52:24 -0700
committerzotlabs <mike@macgirvin.com>2017-04-25 21:52:24 -0700
commit7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95 (patch)
tree428e349ecaa384a74f9aabf0408f68d3e7eed173 /include/message.php
parentf36e384ed7bc76b970862905e87efe88872d5f5d (diff)
downloadvolse-hubzilla-7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95.tar.gz
volse-hubzilla-7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95.tar.bz2
volse-hubzilla-7d5ee81628a08dd560f7fdaa5b4d5a3f5ce3fb95.zip
database support for client side e2ee for private mail
Diffstat (limited to 'include/message.php')
-rw-r--r--include/message.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/message.php b/include/message.php
index da3514184..e7db98d7e 100644
--- a/include/message.php
+++ b/include/message.php
@@ -188,9 +188,10 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
$body = str_rot47(base64url_encode($body));
$sig = ''; // placeholder
+ $mimetype = ''; //placeholder
- $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply )
- VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
+ $r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply )
+ VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
intval($channel['channel_account_id']),
dbesc($conv_guid),
intval(1),
@@ -198,6 +199,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
dbesc($channel['channel_hash']),
dbesc($recipient),
dbesc($subject),
+ dbesc(($mimetype)? $mimetype : 'text/bbcode'),
dbesc($body),
dbesc($sig),
dbesc($jattach),