TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

adjust encrypted content representation and also add it to bb_to_markdown

Browse Source
This commit is contained in:
Mario
2024-03-15 22:34:27 +00:00
parent 826ef11247
commit f3efdbf230
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/bbcode.php
View File

@@ -297,20 +297,20 @@ function bb_parse_crypt($match) {
*/
function bb_parse_b64_crypt($match) {
if(empty($match[2]))
if(empty($match[1])) {
return;
}
$r .= '<code>';
$r .= '----- ENCRYPTED CONTENT -----' . '<br>';
$r .= $match[2] . '<br>';
$r .= '----- END ENCRYPTED CONTENT -----';
$r .= '</code>';
$r = '-----BEGIN ENCRYPTED MESSAGE-----' . "\n";
$r .= $match[1] . "\n";
$r .= '-----END ENCRYPTED MESSAGE-----' . "\n";
$r = '<code>' . str_replace("\n", '<br>', wordwrap($r, 75, "\n", true)) . '</code>';
return $r;
}
function bb_parse_app($match) {
$app = Zotlabs\Lib\Apps::app_decode($match[1]);

23
include/markdown.php
View File

@@ -221,6 +221,21 @@ function bb_to_markdown_transform_tags($match) {
return '#'. str_replace(' ', '_', $match[3]);
}
function bb_to_markdown_parse_b64_crypt($match) {
if(empty($match[1])) {
return;
}
$r = '```' . "\n";
$r .= '-----BEGIN ENCRYPTED MESSAGE-----' . "\n";
$r .= $match[1] . "\n";
$r .= '-----END ENCRYPTED MESSAGE-----' . "\n";
$r .= '```' . "\n";
return wordwrap($r, 75, "\n", true);
}
/**
* @brief Convert bbcode to Markdown.
@@ -244,6 +259,10 @@ function bb_to_markdown($Text, $options = []) {
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text);
if (str_contains($Text, '[/crypt]')) {
$Text = preg_replace_callback("/\[crypt\](.*?)\[\/crypt\]/ism", 'bb_to_markdown_parse_b64_crypt', $Text);
}
$x = [ 'bbcode' => $Text, 'options' => $options ];
/**
@@ -264,8 +283,8 @@ function bb_to_markdown($Text, $options = []) {
// Now convert HTML to Markdown
$Text = html2markdown($Text);
//html2markdown adds backslashes infront of hashes after a new line. remove them
$Text = str_replace("\n\#", "\n#", $Text);
//html2markdown adds backslashes infront of hashes and dashes after a new line. remove them
$Text = str_replace(["\n\#", "\n\-----"], ["\n#", "\n-----"], $Text);
// If the text going into bbcode() has a plain URL in it, i.e.
// with no [url] tags around it, it will come out of parseString()