X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=08c6309018f3335726f23d5b008e29eea7662dec;hb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;hp=9fbfd2d629c7109a4c4ca0777d393a363055c1a2;hpb=dc25355412973bde2f2eedd6ef143ba172e3c4d2;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 = [
- ' . '/images/smiley-heart.gif "<3")
',
- ' . '/images/smiley-brokenheart.gif "</3")
',
- '',
- ' . '/images/smiley-smile.gif ":-)")
',
- ' . '/images/smiley-wink.gif ";-)")
',
- ' . '/images/smiley-frown.gif ":-(")
',
- ' . '/images/smiley-tongue-out.gif ":-P")
',
- '',
- ' . '/images/smiley-kiss.gif ":-\")
',
- '',
- '',
- '',
- ' . '/images/smiley-laughing.gif ":-D")
',
- ' . '/images/smiley-surprised.gif "8-|")
',
- '',
- '',
- ' . '/images/smiley-thumbsup.gif "\\o/")
',
- ' . '/images/smiley-Oo.gif "o.O")
',
- '',
- '',
- '',
- ' . '/images/smiley-cry.gif ":\'(")
',
- ' . '/images/smiley-foot-in-mouth.gif ":-!")
',
- ' . '/images/smiley-undecided.gif ":-/")
',
- ' . '/images/smiley-embarassed.gif ":-[")
',
- ' . '/images/smiley-cool.gif "8-)")
',
- ' . '/images/beer_mug.gif ":beer")
',
- '',
- ' . '/images/coffee.gif ":coffee")
',
- ' . '/images/smiley-facepalm.gif ":facepalm")
',
- ' . '/images/like.gif ":like")
',
- ' . '/images/dislike.gif ":dislike")
',
- '~friendica  . '/images/friendica-16.png "~friendica")
',
- 'red . '/images/rm-16.png "red#")
matrix',
- 'redmatrix'
+ '
',
+ '
',
+ '',
+ '
',
+ '
',
+ '
',
+ '
',
+ '',
+ '![:-\](' . $baseUrl . '/images/smiley-kiss.gif ":-\")
',
+ '',
+ '',
+ '',
+ '
',
+ '
',
+ '',
+ '',
+ '
',
+ '
',
+ '',
+ '',
+ '',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '',
+ '
',
+ '
',
+ '
',
+ '
',
+ '~friendica 
',
+ 'red
matrix',
+ '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]) . '';
}
/**
@@ -253,7 +257,7 @@ class Smilies
*/
private static function decode($m)
{
- return '' . Strings::base64UrlDecode($m[1]) . '';
+ return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '';
}
@@ -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;
}