X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=5e87fd86cc1b45395a297283d86bfd36318c7d3f;hb=6c36fd9e01510a14fea9de766b4afe6760912a2e;hp=2bf232d090464bcfb3f52ce01736e495978ef798;hpb=26accbe3ef7e7ba5d5becd62dcee5c72a2733ed9;p=friendica.git
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 2bf232d090..5e87fd86cc 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -2,7 +2,7 @@
/**
* @file src/Content/Smilies.php
- * @brief This file contains the Smilies class which contains functions to handle smiles
+ * This file contains the Smilies class which contains functions to handle smiles
*
* @todo Use the shortcodes from here:
* https://github.com/iamcal/emoji-data/blob/master/emoji_pretty.json?raw=true
@@ -16,8 +16,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;
/**
@@ -27,7 +26,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 +49,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 +101,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];
@@ -178,7 +179,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,8 +207,8 @@ 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;
}
@@ -260,7 +260,7 @@ class Smilies
/**
- * @brief expand <3333 to the correct number of hearts
+ * expand <3333 to the correct number of hearts
*
* @param string $x string
*