Blanks replaced

[friendica.git] / src / Content / Smilies.php

diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 08c6309018f3335726f23d5b008e29eea7662dec..411f03b463f0204573b6e28df8d104438d452230 100644 (file)
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -1,22 +1,27 @@
 <?php
-
 /**
- * @file src/Content/Smilies.php
- * @brief This file contains the Smilies class which contains functions to handle smiles
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * @todo Use the shortcodes from here:
- * https://github.com/iamcal/emoji-data/blob/master/emoji_pretty.json?raw=true
- * https://raw.githubusercontent.com/emojione/emojione/master/extras/alpha-codes/eac.json?raw=true
- * https://github.com/johannhof/emoji-helper/blob/master/data/emoji.json?raw=true
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * 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\DI;
 use Friendica\Util\Strings;
 
@@ -27,7 +32,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 +55,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.
         *
@@ -137,7 +142,7 @@ class Smilies
                '<img class="smiley" src="' . $baseUrl . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
                '<img class="smiley" src="' . $baseUrl . '/images/like.gif" alt=":like" title=":like" />',
                '<img class="smiley" src="' . $baseUrl . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
-               '<a href="https://friendi.ca">~friendica <img class="smiley" src="' . $baseUrl . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
+               '<a href="https://friendi.ca">~friendica <img class="smiley" width="16" height="16" src="' . $baseUrl . '/images/friendica.svg" alt="~friendica" title="~friendica" /></a>',
                '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
                '<a href="http://redmatrix.me/">red<img class="smiley" src="' . $baseUrl . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
                ];
@@ -180,7 +185,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
         *
@@ -209,8 +213,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;
                }
@@ -262,7 +266,7 @@ class Smilies
 
 
        /**
-        * @brief expand <3333 to the correct number of hearts
+        * expand <3333 to the correct number of hearts
         *
         * @param string $x string
         *