diff options
| -rw-r--r-- | include/api.php | 8 | ||||
| -rw-r--r-- | include/text.php | 11 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/include/api.php b/include/api.php index e4b28bc54..4b413a835 100644 --- a/include/api.php +++ b/include/api.php @@ -1588,7 +1588,7 @@ require_once('include/items.php'); return($as); } - function api_format_messages($item, $recipient, $sender) { + function api_format_message($item, $recipient, $sender) { // standard meta information $ret = array( 'id' => $item['id'], @@ -1600,7 +1600,7 @@ require_once('include/items.php'); 'recipient_screen_name' => $recipient['screen_name'], 'recipient' => $recipient, ); - unobscure($item); + unobscure_mail($item); //don't send title to regular StatusNET requests to avoid confusing these apps if (x($_GET, 'getText')) { $ret['title'] = $item['title'] ; @@ -1963,7 +1963,7 @@ require_once('include/items.php'); if ($id>-1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); - $ret = api_format_messages($r[0], $recipient, $sender); + $ret = api_format_message($r[0], $recipient, $sender); } else { $ret = array("error"=>$id); @@ -2028,7 +2028,7 @@ require_once('include/items.php'); $sender = $user_info; } - $ret[]=api_format_messages($item, $recipient, $sender); + $ret[]=api_format_message($item, $recipient, $sender); } } diff --git a/include/text.php b/include/text.php index f1f6d41f0..f8a990f58 100644 --- a/include/text.php +++ b/include/text.php @@ -1188,6 +1188,17 @@ function unobscure(&$item) { } } +function unobscure_mail(&$item) { + 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); + } +} + + function theme_attachments(&$item) { $arr = json_decode_plus($item['attach']); diff --git a/version.inc b/version.inc index 13f97a89c..a4260342c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-04-18.1006 +2015-04-19.1007 |