harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d* PM cont.

Browse Source
This commit is contained in:
friendica
2014-09-23 04:34:35 -07:00
parent 509a85cb12
commit ad86cc24c8
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/diaspora.php
View File

@@ -2668,7 +2668,7 @@ function diaspora_send_mail($item,$owner,$contact) {
$r = q("select * from conv where id = %d and uid = %d limit 1",
intval($item['convid']),
intval($item['uid'])
intval($item['channel_id'])
);
if(! count($r)) {
@@ -2685,6 +2685,15 @@ function diaspora_send_mail($item,$owner,$contact) {
'participant_handles' => xmlify($cnv['recips'])
);
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
$key = get_config('system','prvkey');
// if($item['title'])
// $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
}
$body = bb2diaspora($item['body']);
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');