X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=d231797b8110718fddb6c41ed88a8f7bdbd94ad3;hb=e95c6781419e8aa158c9c51790ffbf3bb7d1ee00;hp=43289a710ad2c6fa41ed336968d5063a5e2159a8;hpb=6186aac792f6e0e120de8934986d693a22f774fa;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 43289a710a..d231797b81 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -1,6 +1,6 @@
',
@@ -133,7 +133,7 @@ class Smilies
'
',
'
',
'
',
- '
',
+ '
',
'
',
'
',
'
',
@@ -213,13 +213,13 @@ class Smilies
public static function replaceFromArray(string $text, array $smilies, bool $no_images = false): string
{
if (intval(DI::config()->get('system', 'no_smilies'))
- || (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_smilies')))
+ || (DI::userSession()->getLocalUserId() && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'no_smilies')))
) {
return $text;
}
- $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::encode', $text);
- $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::encode', $text);
+ $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', [self::class, 'encode'], $text);
+ $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', [self::class, 'encode'], $text);
if ($no_images) {
$cleaned = ['texts' => [], 'icons' => []];
@@ -233,11 +233,11 @@ class Smilies
$smilies = $cleaned;
}
- $text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text);
+ $text = preg_replace_callback('/<(3+)/', [self::class, 'heartReplaceCallback'], $text);
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
- $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text);
- $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::decode', $text);
+ $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', [self::class, 'decode'], $text);
+ $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', [self::class, 'decode'], $text);
return $text;
}
@@ -269,22 +269,20 @@ class Smilies
/**
* expand <3333 to the correct number of hearts
*
- * @param string $x string
+ * @param array $matches
* @return string HTML Output
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function pregHeart(string $x): string
+ private static function heartReplaceCallback(array $matches): string
{
- if (strlen($x[1]) == 1) {
- return $x[0];
+ if (strlen($matches[1]) == 1) {
+ return $matches[0];
}
$t = '';
- for ($cnt = 0; $cnt < strlen($x[1]); $cnt ++) {
+ for ($cnt = 0; $cnt < strlen($matches[1]); $cnt ++) {
$t .= 'â¤';
}
- $r = str_replace($x[0], $t, $x[0]);
- return $r;
+ return str_replace($matches[0], $t, $matches[0]);
}
}