X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=4a20497a831c70a140135058902bac9b97117601;hb=a3173ccb5074d0da75ecc76fd069fa328e2a9cc4;hp=041662e1eb7f648e44120dd55992f1fb62bdfb62;hpb=cdd23e5b6d1d5ca6af964f71cc3ba612e41375a5;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 041662e1eb..4a20497a83 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -1,23 +1,28 @@ . * - * Have also a look here: - * https://www.webpagefx.com/tools/emoji-cheat-sheet/ */ + 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; /** @@ -27,7 +32,7 @@ use Friendica\Util\Strings; class Smilies { /** - * @brief Replaces/adds the emoticon list + * Replaces/adds the emoticon list * * This function should be used whenever emoticons are added * @@ -50,7 +55,7 @@ class Smilies } /** - * @brief Function to list all smilies + * Function to list all smilies * * Get an array of all smilies, both internal and from addons. * @@ -102,42 +107,44 @@ class Smilies ]; + $baseUrl = DI::baseUrl(); + $icons = [ - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '~friendica ', - 'redmatrix', - 'redmatrix' + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '~friendica ', + 'redmatrix', + 'redmatrix' ]; $params = ['texts' => $texts, 'icons' => $icons]; @@ -178,7 +185,6 @@ class Smilies * function from being executed by the prepare_text() routine when preparing * bbcode source for HTML display * - * @brief Replaces text emoticons with graphical images * @param string $s Text that should be replaced * @param boolean $no_images Only replace emoticons without images * @@ -207,14 +213,14 @@ class Smilies */ public static function replaceFromArray($text, array $smilies, $no_images = false) { - if (intval(Config::get('system', 'no_smilies')) - || (local_user() && intval(PConfig::get(local_user(), 'system', 'no_smilies'))) + if (intval(DI::config()->get('system', 'no_smilies')) + || (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_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' => []];
@@ -231,8 +237,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('/(.*?)<\/pre>/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;
}
@@ -244,7 +250,7 @@ class Smilies
*/
private static function encode($m)
{
- return '' . Strings::base64UrlEncode($m[1]) . '
';
+ return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '' . $m[1] . '>';
}
/**
@@ -255,29 +261,30 @@ class Smilies
*/
private static function decode($m)
{
- return '' . Strings::base64UrlDecode($m[1]) . '
';
+ return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '' . $m[1] . '>';
}
/**
- * @brief expand <3333 to the correct number of hearts
+ * expand <3333 to the correct number of hearts
*
* @param string $x string
*
* @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;
}