aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-27 20:22:28 -0700
committerMario Vavti <mario@mariovavti.com>2017-05-01 15:10:42 +0200
commitfdf639e1fb0953943ece41d680e992c1241bf2c8 (patch)
tree3e15a983a68aa893c4730e508096394572fc5e91
parent25760e30f9859f42885c1d6bc980a3fef8624ee1 (diff)
downloadvolse-hubzilla-fdf639e1fb0953943ece41d680e992c1241bf2c8.tar.gz
volse-hubzilla-fdf639e1fb0953943ece41d680e992c1241bf2c8.tar.bz2
volse-hubzilla-fdf639e1fb0953943ece41d680e992c1241bf2c8.zip
more work client mail crypto
-rw-r--r--include/message.php20
1 files changed, 15 insertions, 5 deletions
diff --git a/include/message.php b/include/message.php
index e7db98d7e..801f4b067 100644
--- a/include/message.php
+++ b/include/message.php
@@ -35,13 +35,15 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
$body = cleanup_bbcode($body);
$results = linkify_tags($a, $body, $uid);
-
- if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
- $attaches = $match[1];
+ if(! $raw) {
+ if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) {
+ $attaches = $match[1];
+ }
+ }
$attachments = '';
- if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
+ if((! $raw) && preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
$attachments = array();
foreach($match[2] as $mtch) {
$hash = substr($mtch,0,strpos($mtch,','));
@@ -184,7 +186,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
if($subject)
$subject = str_rot47(base64url_encode($subject));
- if($body)
+ if(($body )&& (! $raw))
$body = str_rot47(base64url_encode($body));
$sig = ''; // placeholder
@@ -353,6 +355,9 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
if($r[$k]['body'])
$r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
}
+ if($r[$k]['mail_raw'])
+ $r[$k]['body'] = mail_prepare_binary([ 'id' => $r[$k]['id'] ]);
+
}
return $r;
@@ -391,6 +396,8 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
if($messages[$k]['body'])
$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
}
+ if($messages[$k]['mail_raw'])
+ $messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
}
@@ -514,6 +521,9 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda
if($messages[$k]['body'])
$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
}
+ if($messages[$k]['mail_raw'])
+ $messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
+
}