diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-26 23:05:30 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-26 23:05:30 -0700 |
| commit | e8ea8d203db5bdf62995f1831b1503ac11556435 (patch) | |
| tree | b4f02e963ff238de990f12ab03346fd0448d5ca5 /include/items.php | |
| parent | ac670856f67d5ff2b6a61e76103e331039dbf6b1 (diff) | |
| download | volse-hubzilla-e8ea8d203db5bdf62995f1831b1503ac11556435.tar.gz volse-hubzilla-e8ea8d203db5bdf62995f1831b1503ac11556435.tar.bz2 volse-hubzilla-e8ea8d203db5bdf62995f1831b1503ac11556435.zip | |
more client-side mail privacy work
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 1f79ee567..7cad3b168 100755 --- a/include/items.php +++ b/include/items.php @@ -1333,6 +1333,8 @@ function encode_mail($item,$extended = false) { $x['body'] = $item['body']; $x['from'] = encode_item_xchan($item['from']); $x['to'] = encode_item_xchan($item['to']); + $x['raw'] = $item['mail_raw']; + $x['mimetype'] = $item['mail_mimetype']; if($item['attach']) $x['attach'] = json_decode($item['attach'],true); @@ -1366,9 +1368,16 @@ function get_mail_elements($x) { $arr = array(); - $arr['body'] = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : ''); - $arr['title'] = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : ''); + if(intval($x['raw'])) { + $arr['mail_raw'] = intval($x['raw']); + $arr['body'] = $x['body']; + } + else { + $arr['body'] = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : ''); + } + $arr['title'] = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : ''); + $arr['mail_mimetype'] = (($x['mimetype']) ? htmlspecialchars($x['mimetype'],ENT_COMPAT,'UTF-8',false) : 'text/bbcode'); $arr['conv_guid'] = (($x['conv_guid'])? htmlspecialchars($x['conv_guid'],ENT_COMPAT,'UTF-8',false) : ''); $arr['created'] = datetime_convert('UTC','UTC',$x['created']); @@ -2949,8 +2958,10 @@ function mail_store($arr) { $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); $arr['conv_guid'] = ((x($arr,'conv_guid')) ? trim($arr['conv_guid']) : ''); + $arr['mail_mimetype'] = ((x($arr,'mail_mimetype')) ? trim($arr['mail_mimetype']) : 'text/bbcode'); $arr['mail_flags'] = ((x($arr,'mail_flags')) ? intval($arr['mail_flags']) : 0 ); + $arr['mail_raw'] = ((x($arr,'mail_raw')) ? intval($arr['mail_raw']) : 0 ); if(! $arr['parent_mid']) { logger('mail_store: missing parent'); |