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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix
2015-10-14 13:13:12 -07:00
parent 64cdbb8e3b 9b1195c896
commit c7637a0c53
4 changed files with 5460 additions and 5482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/items.php
View File

@@ -1559,7 +1559,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';
@@ -1592,6 +1592,18 @@ function encode_mail($item) {
$x['body'] = '';
}
if($extended) {
$x['conv_guid'] = $item['conv_guid'];
if($item['mail_flags'] & MAIL_DELETED)
$x['flags'][] = 'deleted';
if($item['mail_flags'] & MAIL_REPLIED)
$x['flags'][] = 'replied';
if($item['mail_flags'] & MAIL_ISREPLY)
$x['flags'][] = 'isreply';
if($item['mail_flags'] & MAIL_SEEN)
$x['flags'][] = 'seen';
}
return $x;
}
@@ -1616,6 +1628,18 @@ function get_mail_elements($x) {
if(in_array('recalled',$x['flags'])) {
$arr['mail_recalled'] = 1;
}
if(in_array('replied',$x['flags'])) {
$arr['mail_flags'] |= MAIL_REPLIED;
}
if(in_array('isreply',$x['flags'])) {
$arr['mail_flags'] |= MAIL_ISREPLY;
}
if(in_array('seen',$x['flags'])) {
$arr['mail_flags'] |= MAIL_SEEN;
}
if(in_array('deleted',$x['flags'])) {
$arr['mail_flags'] |= MAIL_DELETED;
}
}
$key = get_config('system','pubkey');