X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=08c6309018f3335726f23d5b008e29eea7662dec;hb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;hp=2bc7fffd61454d82db491b39afbaf9759acd614c;hpb=55e54bb9500f54bb075dcbc2054018de0969d9e7;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 2bc7fffd61..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;
/**
@@ -55,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()
{
@@ -101,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];
@@ -182,6 +185,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)
{
@@ -201,6 +205,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)
{
@@ -210,8 +215,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' => []];
@@ -228,8 +233,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;
}
@@ -241,17 +246,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]) . '';
}
/**
* @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]) . '';
}
@@ -262,17 +268,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;
}