X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=4a20497a831c70a140135058902bac9b97117601;hb=c376081d0d00218ea494991de1d4a05c3b4c1567;hp=292841361e75d92344dc37329bfcc02b80c07c9c;hpb=d4a02dc31408210ab9f67ecac1948dc22b95b8da;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 292841361e..4a20497a83 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -1,24 +1,28 @@ . * - * Have also a look here: - * https://www.webpagefx.com/tools/emoji-cheat-sheet/ */ + namespace Friendica\Content; -use Friendica\App; -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\PConfig; -use Friendica\Core\System; +use Friendica\Core\Hook; +use Friendica\DI; use Friendica\Util\Strings; /** @@ -28,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 * @@ -51,15 +55,16 @@ class Smilies } /** - * @brief Function to list all smilies + * Function to list all 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() { @@ -102,46 +107,48 @@ class Smilies ]; + $baseUrl = DI::baseUrl(); + $icons = [ - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '~friendica ', - 'redmatrix', - 'redmatrix' + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '~friendica ', + 'redmatrix', + 'redmatrix' ]; $params = ['texts' => $texts, 'icons' => $icons]; - Addon::callHooks('smilie', $params); + Hook::callAll('smilie', $params); return $params; } @@ -178,11 +185,11 @@ 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 * * @return string HTML Output of the Smilie + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function replace($s, $no_images = false) { @@ -202,17 +209,18 @@ 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) { - 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' => []];
@@ -229,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('/(.*?)<\/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,38 +250,41 @@ 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] . '>';
}
/**
- * @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
*
- * @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;
}