X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=2bf232d090464bcfb3f52ce01736e495978ef798;hb=f2d4a5eb7d0b5c153f73c4cc4e7bcb63dce1bb06;hp=292841361e75d92344dc37329bfcc02b80c07c9c;hpb=d577ab98eb0f28f9f807795f54c87d80ef9c0dc2;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 292841361e..2bf232d090 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -14,9 +14,8 @@ */ namespace Friendica\Content; -use Friendica\App; -use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\PConfig; use Friendica\Core\System; use Friendica\Util\Strings; @@ -56,10 +55,11 @@ class Smilies * Get an array of all smilies, both internal and from addons. * * @return array - * 'texts' => smilie shortcut - * 'icons' => icon in html + * 'texts' => smilie shortcut + * 'icons' => icon in html * - * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array) + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array) */ public static function getList() { @@ -141,7 +141,7 @@ class Smilies ]; $params = ['texts' => $texts, 'icons' => $icons]; - Addon::callHooks('smilie', $params); + Hook::callAll('smilie', $params); return $params; } @@ -183,6 +183,7 @@ class Smilies * @param boolean $no_images Only replace emoticons without images * * @return string HTML Output of the Smilie + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function replace($s, $no_images = false) { @@ -202,6 +203,7 @@ class Smilies * @param array $smilies An string replacement array with the following structure: ['texts' => [], 'icons' => []] * @param bool $no_images Only replace shortcodes without image replacement (e.g. Unicode characters) * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function replaceFromArray($text, array $smilies, $no_images = false) { @@ -211,8 +213,8 @@ class Smilies return $text; } - $text = preg_replace_callback('/
(.*?)<\/pre>/ism' , 'self::encode', $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' => []];
@@ -229,8 +231,8 @@ class Smilies
$text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text);
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
- $text = preg_replace_callback('/(.*?)<\/pre>/ism', 'self::decode', $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,17 +244,18 @@ class Smilies
*/
private static function encode($m)
{
- return(str_replace($m[1], Strings::base64UrlEncode($m[1]), $m[0]));
+ return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '' . $m[1] . '>';
}
/**
* @param string $m string
*
* @return string base64 decoded string
+ * @throws \Exception
*/
private static function decode($m)
{
- return(str_replace($m[1], Strings::base64UrlDecode($m[1]), $m[0]));
+ return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '' . $m[1] . '>';
}
@@ -263,17 +266,19 @@ class Smilies
*
* @return string HTML Output
*
- * @todo: Rework because it doesn't work correctly
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
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;
}