Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace

[friendica.git] / src / Content / Widget / TagCloud.php

diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 65646ba0dd6e37296d10e727a1f98388a5d038de..d775d010a81175e743fbdb5d38cc1aa37f5ef9fb 100644 (file)
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -7,12 +7,10 @@
 namespace Friendica\Content\Widget;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
-
-require_once 'include/dba.php';
-require_once 'include/security.php';
+use Friendica\Model\Item;
 
 /**
  * TagCloud widget
@@ -25,13 +23,14 @@ class TagCloud
         * Construct a tag/term cloud block for an user.
         *
         * @brief Construct a tag/term cloud block for an user.
-        * @param int $uid      The user ID.
-        * @param int $count    Max number of displayed tags/terms.
-        * @param int $owner_id The contact ID of the owner of the tagged items.
-        * @param string $flags Special item flags.
-        * @param int $type     The tag/term type.
+        * @param int    $uid      The user ID.
+        * @param int    $count    Max number of displayed tags/terms.
+        * @param int    $owner_id The contact ID of the owner of the tagged items.
+        * @param string $flags    Special item flags.
+        * @param int    $type     The tag/term type.
         *
         * @return string       HTML formatted output.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getHTML($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
        {
@@ -49,8 +48,8 @@ class TagCloud
                                $tags[] = $tag;
                        }
 
-                       $tpl = get_markup_template('tagblock_widget.tpl');
-                       $o = replace_macros($tpl, [
+                       $tpl = Renderer::getMarkupTemplate('tagblock_widget.tpl');
+                       $o = Renderer::replaceMacros($tpl, [
                                '$title' => L10n::t('Tags'),
                                '$tags' => $tags
                        ]);
@@ -64,17 +63,18 @@ class TagCloud
         *
         * @brief Get alphabetical sorted array of used tags/terms of an user including
         * a weighting by frequency of use.
-        * @param int $uid      The user ID.
-        * @param int $count    Max number of displayed tags/terms.
-        * @param int $owner_id The contact id of the owner of the tagged items.
-        * @param string $flags Special item flags.
-        * @param int $type     The tag/term type.
+        * @param int    $uid      The user ID.
+        * @param int    $count    Max number of displayed tags/terms.
+        * @param int    $owner_id The contact id of the owner of the tagged items.
+        * @param string $flags    Special item flags.
+        * @param int    $type     The tag/term type.
         *
-        * @return arr          Alphabetical sorted array of used tags of an user.
+        * @return array        Alphabetical sorted array of used tags of an user.
+        * @throws \Exception
         */
        private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
        {
-               $sql_options = item_permissions_sql($uid);
+               $sql_options = Item::getPermissionsSQLByUserId($uid);
                $limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
 
                if ($flags) {
@@ -99,7 +99,7 @@ class TagCloud
                        $type,
                        TERM_OBJ_POST
                );
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return [];
                }
 
@@ -147,8 +147,8 @@ class TagCloud
         * Compare function to sort tags/terms alphabetically.
         *
         * @brief Compare function to sort tags/terms alphabetically.
-        * @param type $a
-        * @param type $b
+        * @param string $a
+        * @param string $b
         *
         * @return int
         */