From ee8aba3221f995b265c3196505a1c7c26b76f116 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 10 Mar 2024 22:35:59 +0000
Subject: implement sodium-plus library to replace unmaintained sjcl

---
 include/bbcode.php | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 848d117fb..b39822b05 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -247,41 +247,39 @@ function bb_parse_crypt($match) {
 
 	$matches = [];
 	$attributes = $match[1];
-
-	$algorithm = "";
+	$hint = '';
+	$algorithm = '';
 
 	preg_match("/alg='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$algorithm = $matches[1];
-
-	preg_match("/alg=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$algorithm = $matches[1];
+	$algorithm = $matches[1] ?? '';
 
-	$hint = "";
+	if (!$algorithm) {
+		preg_match("/alg=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
+		$algorithm = $matches[1] ?? '';
+	}
 
 	preg_match("/hint='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$hint = $matches[1];
-	preg_match("/hint=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$hint = $matches[1];
+	$hint = $matches[1] ?? '';
+
+	if (!$hint) {
+		preg_match("/hint=\&quot\;(.*?)\&quot\;/ism", $attributes, $matches);
+		$hint = $matches[1] ?? '';
+	}
 
 	$x = random_string();
 
-	$f = 'hz_decrypt';
+	$f = 'sodium_decrypt';
 
-	//legacy cryptojs support
-	if(plugin_is_installed('cryptojs')) {
-		$f = ((in_array($algorithm, ['AES-128-CCM', 'rot13', 'triple-rot13'])) ? 'hz_decrypt' : 'red_decrypt');
+	if (in_array($algorithm, ['AES-128-CCM', 'rot13', 'triple-rot13'])) {
+		$f = 'hz_decrypt'; // deprecated
 	}
 
 	$onclick = 'onclick="' . $f . '(\'' . $algorithm . '\',\'' . $hint . '\',\'' . $match[2] . '\',\'#' . $x . '\');"';
 	$label = t('Encrypted content');
 
-	$Text = '<br /><div id="' . $x . '"><img class="cursor-pointer" src="' . z_root() . '/images/lock_icon.svg" ' . $onclick . ' alt="' . $label . '" title="' . $label . '" /></div><br />';
+	$text = '<br /><div id="' . $x . '"><img class="cursor-pointer" src="' . z_root() . '/images/lock_icon.svg" ' . $onclick . ' alt="' . $label . '" title="' . $label . '" /></div><br />';
 
-	return $Text;
+	return $text;
 }
 
 /**
-- 
cgit v1.2.3