X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FSmilies.php;h=9fbfd2d629c7109a4c4ca0777d393a363055c1a2;hb=8eba329111e832d7efdacf4f6a6fa85b0f7abbf3;hp=2fedb894270116befdbac68613c29e495bb1ef59;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 2fedb89427..9fbfd2d629 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -14,11 +14,11 @@
  */
 namespace Friendica\Content;
 
-use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Util\Strings;
 
 /**
  * This class contains functions to handle smiles
@@ -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()
 	{
@@ -140,7 +141,7 @@ class Smilies
 		];
 
 		$params = ['texts' => $texts, 'icons' => $icons];
-		Addon::callHooks('smilie', $params);
+		Hook::callAll('smilie', $params);
 
 		return $params;
 	}
@@ -167,7 +168,7 @@ class Smilies
 	}
 
 	/**
-	 * @brief Replaces text emoticons with graphical images
+	 * 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
@@ -177,53 +178,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
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	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 <pre> and <code> 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 replace($s, $sample = false, $no_images = false)
+	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>(.*?)<\/pre>/ism', 'self::encode', $s);
-		$s = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $s);
-
-		$params = self::getList();
+		$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, '<img ')) {
-					$cleaned['texts'][] = $params['texts'][$key];
-					$cleaned['icons'][] = $params['icons'][$key];
+					$cleaned['texts'][] = $smilies['texts'][$key];
+					$cleaned['icons'][] = $smilies['icons'][$key];
 				}
 			}
-			$params = $cleaned;
+			$smilies = $cleaned;
 		}
 
-		$params['string'] = $s;
+		$text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $text);
+		$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
 
-		if ($sample) {
-			$s = '<div class="smiley-sample">';
-			for ($x = 0; $x < count($params['texts']); $x ++) {
-				$s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
-			}
-		} else {
-			$params['string'] = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $params['string']);
-			$s = self::strOrigReplace($params['texts'], $params['icons'], $params['string']);
-		}
+		$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
 
-		$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $s);
-		$s = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $s);
-
-		return $s;
+		return $text;
 	}
 
 	/**
@@ -233,17 +242,18 @@ class Smilies
 	 */
 	private static function encode($m)
 	{
-		return(str_replace($m[1], base64url_encode($m[1]), $m[0]));
+		return '<code>' . Strings::base64UrlEncode($m[1]) . '</code>';
 	}
 
 	/**
 	 * @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 '<code>' . Strings::base64UrlDecode($m[1]) . '</code>';
 	}
 
 
@@ -254,7 +264,8 @@ class Smilies
 	 *
 	 * @return string HTML Output
 	 *
-	 * @todo: Rework because it doesn't work correctly
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @todo  : Rework because it doesn't work correctly
 	 */
 	private static function pregHeart($x)
 	{