diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 21:01:59 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 21:01:59 -0700 |
| commit | 1a0655f34ea9979c7a08d21344d3e0eb9eb3246d (patch) | |
| tree | 5dde4224a3c762bcc1935b2e67464939e57a60d2 /include/items.php | |
| parent | cb76fb8b9b659c4ec06e359f375a35a534927b99 (diff) | |
| download | volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.gz volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.bz2 volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.zip | |
more work on mail flags
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index ee8ce5575..cf7e28daa 100755 --- a/include/items.php +++ b/include/items.php @@ -1473,7 +1473,7 @@ function encode_mail($item) { $x['type'] = 'mail'; $x['encoding'] = 'zot'; - if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) { + if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) $item['title'] = base64url_decode(str_rot47($item['title'])); if($item['body']) @@ -1495,7 +1495,7 @@ function encode_mail($item) { $x['flags'] = array(); - if($item['mail_flags'] & MAIL_RECALLED) { + if(intval($item['mail_recalled'])) { $x['flags'][] = 'recalled'; $x['title'] = ''; $x['body'] = ''; @@ -1523,12 +1523,12 @@ function get_mail_elements($x) { if($x['flags'] && is_array($x['flags'])) { if(in_array('recalled',$x['flags'])) { - $arr['mail_flags'] |= MAIL_RECALLED; + $arr['mail_recalled'] = 1; } } $key = get_config('system','pubkey'); - $arr['mail_flags'] |= MAIL_OBSCURED; + $arr['mail_obscured'] = 1; if($arr['body']) { $arr['body'] = str_rot47(base64url_encode($arr['body'])); $arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false); |