X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=4a20497a831c70a140135058902bac9b97117601;hb=c376081d0d00218ea494991de1d4a05c3b4c1567;hp=89a833d71098762dd1f8f583bd1b447a76ccb7e4;hpb=11cf36105ccd359c9d21a006e13b3767712196b6;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 89a833d710..4a20497a83 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -1,24 +1,29 @@ . * - * 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; /** * This class contains functions to handle smiles @@ -27,7 +32,7 @@ use Friendica\Core\System; class Smilies { /** - * @brief Replaces/adds the emoticon list + * Replaces/adds the emoticon list * * This function should be used whenever emoticons are added * @@ -50,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() { @@ -101,52 +107,75 @@ 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; } + /** - * @brief Replaces text emoticons with graphical images + * Copied from http://php.net/manual/en/function.str-replace.php#88569 + * Modified for camel caps: renamed stro_replace -> strOrigReplace + * + * When using str_replace(...), values that did not exist in the original string (but were put there by previous + * replacements) will be replaced continuously. This string replacement function is designed to replace the values + * in $search with those in $replace while not factoring in prior replacements. Note that this function will + * always look for the longest possible match first and then work its way down to individual characters. + * + * @param array $search list of strings or characters that need to be replaced + * @param array $replace list of strings or characters that will replace the corresponding values in $search + * @param string $subject the string on which this operation is being performed + * + * @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) + { + return strtr($subject, array_combine($search, $replace)); + } + + /** + * Replaces text emoticons with graphical images * * It is expected that this function will be called using HTML text. * We will escape text between HTML pre and code blocks from being @@ -157,52 +186,61 @@ class Smilies * bbcode source for HTML display * * @param string $s Text that should be replaced - * @param boolean $sample optional, default false * @param boolean $no_images Only replace emoticons without images * - * @return string HML Output of the Smilie + * @return string HTML Output of the Smilie + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function replace($s, $sample = false, $no_images = false) + public static function replace($s, $no_images = false) { - if (intval(Config::get('system', 'no_smilies')) - || (local_user() && intval(PConfig::get(local_user(), 'system', 'no_smilies'))) + $smilies = self::getList(); + + $s = self::replaceFromArray($s, $smilies, $no_images); + + return $s; + } + + /** + * Replaces emoji shortcodes in a string from a structured array of searches and replaces. + * + * Depends on system.no_smilies config value, skips
and tags.
+ *
+ * @param string $text An HTML string
+ * @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(DI::config()->get('system', 'no_smilies'))
+ || (local_user() && intval(DI::pConfig()->get(local_user(), 'system', 'no_smilies')))
) {
- return $s;
+ return $text;
}
- $s = preg_replace_callback('/(.*?)<\/pre>/ism', 'self::encode', $s);
- $s = preg_replace_callback('/(.*?)<\/code>/ism', 'self::encode', $s);
-
- $params = self::getList();
+ $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' => []];
- $icons = $params['icons'];
+ $icons = $smilies['icons'];
foreach ($icons as $key => $icon) {
if (!strstr($icon, '';
- for ($x = 0; $x < count($params['texts']); $x ++) {
- $s .= '- ' . $params['texts'][$x] . '
- ' . $params['icons'][$x] . '
';
- }
- } else {
- $params['string'] = preg_replace_callback('/<(3+)/', 'self::pregHeart', $params['string']);
- $s = str_replace($params['texts'], $params['icons'], $params['string']);
- }
+ $text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text);
+ $text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
- $s = preg_replace_callback('/(.*?)<\/pre>/ism', 'self::decode', $s);
- $s = preg_replace_callback('/(.*?)<\/code>/ism', 'self::decode', $s);
+ $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text);
+ $text = preg_replace_callback('/<(pre)>(.*?)<\/pre>/ism', 'self::decode', $text);
- return $s;
+ return $text;
}
/**
@@ -212,38 +250,41 @@ class Smilies
*/
private static function encode($m)
{
- return(str_replace($m[1], base64url_encode($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], base64url_decode($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;
}