From 4da3933f244d9bb820305d49b0fe09679e297a6e Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Fri, 14 Jun 2019 20:52:21 +0200 Subject: Add signatures processing for private messages --- Zotlabs/Module/Mail.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Mail.php') diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 3202d38a5..c454a2331 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -25,6 +25,7 @@ class Mail extends \Zotlabs\Web\Controller { $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); $raw = ((x($_REQUEST,'raw')) ? intval($_REQUEST['raw']) : 0); $mimetype = ((x($_REQUEST,'mimetype')) ? notags(trim($_REQUEST['mimetype'])) : 'text/bbcode'); + $sig = ((x($_REQUEST,'signature')) ? trim($_REQUEST['signature']) : ''); if($preview) { @@ -123,7 +124,7 @@ class Mail extends \Zotlabs\Web\Controller { // We have a local_channel, let send_message use the session channel and save a lookup - $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires, $mimetype, $raw); + $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires, $mimetype, $raw, $sig); if($ret['success']) { xchan_mail_query($ret['mail']); @@ -396,8 +397,9 @@ class Mail extends \Zotlabs\Web\Controller { 'can_recall' => ($channel['channel_hash'] == $message['from_xchan']), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'), + 'sig' => $message['sig'] ); - + $seen = $message['seen']; } -- cgit v1.2.3 From c9615cc19ccf09873fbc4c18438f110f81ac0864 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Fri, 14 Jun 2019 21:08:53 +0200 Subject: Formatting --- Zotlabs/Module/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Mail.php') diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index c454a2331..4e4c18cae 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -25,7 +25,7 @@ class Mail extends \Zotlabs\Web\Controller { $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); $raw = ((x($_REQUEST,'raw')) ? intval($_REQUEST['raw']) : 0); $mimetype = ((x($_REQUEST,'mimetype')) ? notags(trim($_REQUEST['mimetype'])) : 'text/bbcode'); - $sig = ((x($_REQUEST,'signature')) ? trim($_REQUEST['signature']) : ''); + $sig = ((x($_REQUEST,'signature')) ? trim($_REQUEST['signature']) : ''); if($preview) { -- cgit v1.2.3 From 335394aaa110d1fd7cc5804cee1c7b56ccfdd63e Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 15 Jun 2019 15:58:55 +0200 Subject: Add base64 decode if signature encoded --- Zotlabs/Module/Mail.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Zotlabs/Module/Mail.php') diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 4e4c18cae..67d9642b9 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -25,7 +25,10 @@ class Mail extends \Zotlabs\Web\Controller { $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); $raw = ((x($_REQUEST,'raw')) ? intval($_REQUEST['raw']) : 0); $mimetype = ((x($_REQUEST,'mimetype')) ? notags(trim($_REQUEST['mimetype'])) : 'text/bbcode'); + $sig = ((x($_REQUEST,'signature')) ? trim($_REQUEST['signature']) : ''); + if(strpos($sig,'b64.') === 0) + $sig = base64_decode(str_replace('b64.', '', $sig)); if($preview) { -- cgit v1.2.3 From 43cec4398d0d035dd9446988134b814513a73080 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 15 Jun 2019 16:03:35 +0200 Subject: base64 encode message signature --- Zotlabs/Module/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Mail.php') diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 67d9642b9..7c344966b 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -400,7 +400,7 @@ class Mail extends \Zotlabs\Web\Controller { 'can_recall' => ($channel['channel_hash'] == $message['from_xchan']), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'), - 'sig' => $message['sig'] + 'sig' => base64_encode($message['sig']) ); $seen = $message['seen']; -- cgit v1.2.3