X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=2bf232d090464bcfb3f52ce01736e495978ef798;hb=f2d4a5eb7d0b5c153f73c4cc4e7bcb63dce1bb06;hp=9fbfd2d629c7109a4c4ca0777d393a363055c1a2;hpb=09e03c92137ea89781aeb0adad6a1a599f7d617a;p=friendica.git

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 9fbfd2d629..2bf232d090 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -213,7 +213,8 @@ class Smilies
 			return $text;
 		}
 
-		$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $text);
+		$text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::encode', $text);
+		$text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::encode', $text);
 
 		if ($no_images) {
 			$cleaned = ['texts' => [], 'icons' => []];
@@ -230,7 +231,8 @@ class Smilies
 		$text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $text);
 		$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
 
-		$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
+		$text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text);
+		$text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::decode', $text);
 
 		return $text;
 	}
@@ -242,7 +244,7 @@ class Smilies
 	 */
 	private static function encode($m)
 	{
-		return '<code>' . Strings::base64UrlEncode($m[1]) . '</code>';
+		return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '</' . $m[1] . '>';
 	}
 
 	/**
@@ -253,7 +255,7 @@ class Smilies
 	 */
 	private static function decode($m)
 	{
-		return '<code>' . Strings::base64UrlDecode($m[1]) . '</code>';
+		return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '</' . $m[1] . '>';
 	}
 
 
@@ -265,17 +267,18 @@ class Smilies
 	 * @return string HTML Output
 	 *
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @todo  : Rework because it doesn't work correctly
 	 */
 	private static function pregHeart($x)
 	{
 		if (strlen($x[1]) == 1) {
 			return $x[0];
 		}
+
 		$t = '';
 		for ($cnt = 0; $cnt < strlen($x[1]); $cnt ++) {
-			$t .= '<img class="smiley" src="' . System::baseUrl() . '/images/smiley-heart.gif" alt="&lt;3" />';
+			$t .= '❤';
 		}
+
 		$r =  str_replace($x[0], $t, $x[0]);
 		return $r;
 	}