X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=ff9d63882ea5b6ef62bf65a03fdbffcbbaf7e380;hb=7c5815f14e4b377293c46af95c358bda704d4419;hp=2bf232d090464bcfb3f52ce01736e495978ef798;hpb=2fb70bd5f2884b95398620d046174b24ce1c5316;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 2bf232d090..ff9d63882e 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,17 +32,16 @@ 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
*
* @param array $b Array of emoticons
* @param string $smiley The text smilie
* @param string $representation The replacement
- *
* @return void
*/
- public static function add(&$b, $smiley, $representation)
+ public static function add(array &$b, string $smiley, string $representation)
{
$found = array_search($smiley, $b['texts']);
@@ -50,7 +54,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.
*
@@ -61,7 +65,7 @@ class Smilies
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
*/
- public static function getList()
+ public static function getList(): array
{
$texts = [
'<3',
@@ -102,42 +106,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];
@@ -162,7 +168,7 @@ class Smilies
*
* @return string $subject with all substrings in the $search array replaced by the values in the $replace array
*/
- private static function strOrigReplace($search, $replace, $subject)
+ private static function strOrigReplace(array $search, array $replace, string $subject): string
{
return strtr($subject, array_combine($search, $replace));
}
@@ -178,14 +184,13 @@ 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)
+ public static function replace(string $s, bool $no_images = false): string
{
$smilies = self::getList();
@@ -205,16 +210,16 @@ class Smilies
* @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function replaceFromArray($text, array $smilies, $no_images = false)
+ public static function replaceFromArray(string $text, array $smilies, bool $no_images = false): string
{
- 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'))
+ || (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' => []];
@@ -228,58 +233,56 @@ 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;
}
/**
- * @param string $m string
+ * Encodes smiley match array to BASE64 string
*
+ * @param array $m Match array
* @return string base64 encoded string
*/
- private static function encode($m)
+ private static function encode(array $m): string
{
return '<' . $m[1] . '>' . Strings::base64UrlEncode($m[2]) . '';
}
/**
- * @param string $m string
+ * Decodes a previously BASE64-encoded match array to a string
*
+ * @param array $m Matches array
* @return string base64 decoded string
* @throws \Exception
*/
- private static function decode($m)
+ private static function decode(array $m): string
{
return '<' . $m[1] . '>' . Strings::base64UrlDecode($m[2]) . '';
}
/**
- * @brief expand <3333 to the correct number of hearts
- *
- * @param string $x string
+ * expand <3333 to the correct number of hearts
*
+ * @param array $matches
* @return string HTML Output
- *
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function pregHeart($x)
+ 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]);
}
}