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

Merge branch 'master' of https://github.com/redmatrix/hubzilla

Browse Source
This commit is contained in:
Mario Vavti
2015-10-14 22:57:03 +02:00
parent c8d8ae89d7 b2d949ce9a
commit b6eded1119
5 changed files with 5461 additions and 5483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/items.php
View File

@@ -1561,7 +1561,7 @@ function encode_item_flags($item) {
return $ret;
}
function encode_mail($item) {
function encode_mail($item,$extended = false) {
$x = array();
$x['type'] = 'mail';
$x['encoding'] = 'zot';
@@ -1594,6 +1594,18 @@ function encode_mail($item) {
$x['body'] = '';
}
if($extended) {
$x['conv_guid'] = $item['conv_guid'];
if(intval($item['mail_deleted']))
$x['flags'][] = 'deleted';
if(intval($item['mail_replied']))
$x['flags'][] = 'replied';
if(intval($item['mail_isreply']))
$x['flags'][] = 'isreply';
if(intval($item['mail_seen']))
$x['flags'][] = 'seen';
}
return $x;
}
@@ -1618,6 +1630,18 @@ function get_mail_elements($x) {
if(in_array('recalled',$x['flags'])) {
$arr['mail_recalled'] = 1;
}
if(in_array('replied',$x['flags'])) {
$arr['mail_replied'] = 1;
}
if(in_array('isreply',$x['flags'])) {
$arr['mail_isreply'] = 1;
}
if(in_array('seen',$x['flags'])) {
$arr['mail_seen'] = 1;
}
if(in_array('deleted',$x['flags'])) {
$arr['mail_deleted'] = 1;
}
}
$key = get_config('system','pubkey');