X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FContent%2FSmilies.php;h=39de3c20e04a6d74bcdbab0bc53c08c20fa96218;hb=dc4b6ba55996ff2dee23f329502ff41a9d651962;hp=201530cb823102ae9aa025652c1e165e045ff9b0;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 201530cb82..39de3c20e0 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -15,6 +15,7 @@ namespace Friendica\Content; use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; @@ -139,13 +140,34 @@ class Smilies ]; $params = ['texts' => $texts, 'icons' => $icons]; - call_hooks('smilie', $params); + Addon::callHooks('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 @@ -155,53 +177,61 @@ 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 $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 */ - public static function replace($s, $sample = false, $no_images = false) + public static function replace($s, $no_images = false) + { + $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
+ */
+ 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')))
) {
- 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>/ism' , 'self::encode', $text);
+ $text = preg_replace_callback('/(.*?)<\/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('/(.*?)<\/pre>/ism', 'self::decode', $text);
+ $text = preg_replace_callback('/(.*?)<\/code>/ism', 'self::decode', $text);
- return $s;
+ return $text;
}
/**