X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=08c6309018f3335726f23d5b008e29eea7662dec;hb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;hp=9fbfd2d629c7109a4c4ca0777d393a363055c1a2;hpb=55325f191bd90a70dd31b066a47c3c2044981278;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 9fbfd2d629..08c6309018 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -17,7 +17,7 @@ namespace Friendica\Content;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\PConfig;
-use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
@@ -102,42 +102,44 @@ class Smilies
];
+ $baseUrl = DI::baseUrl();
+
$icons = [
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '~friendica ',
- 'redmatrix',
- 'redmatrix'
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '~friendica ',
+ 'redmatrix',
+ 'redmatrix'
];
$params = ['texts' => $texts, 'icons' => $icons];
@@ -213,7 +215,8 @@ class Smilies
return $text;
}
- $text = preg_replace_callback('/(.*?)<\/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 +233,8 @@ class Smilies
$text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text);
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
- $text = preg_replace_callback('/(.*?)<\/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 +246,7 @@ class Smilies
*/
private static function encode($m)
{
- return '' . Strings::base64UrlEncode($m[1]) . '
';
+ return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '' . $m[1] . '>';
}
/**
@@ -253,7 +257,7 @@ class Smilies
*/
private static function decode($m)
{
- return '' . Strings::base64UrlDecode($m[1]) . '
';
+ return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '' . $m[1] . '>';
}
@@ -265,17 +269,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 .= '';
+ $t .= 'â¤';
}
+
$r = str_replace($x[0], $t, $x[0]);
return $r;
}