]> git.mxchange.org Git - friendica.git/blobdiff - src/Content/ForumManager.php
Merge pull request #8134 from nupplaphil/task/di_l10n
[friendica.git] / src / Content / ForumManager.php
index ac745c50ff672655ea5b16be8c68cf1c9202d3e8..f3f3392ec189c907ef77be4cd3f8723c70dca2a7 100644 (file)
@@ -1,27 +1,25 @@
 <?php
 /**
  * @file src/Content/ForumManager.php
- * @brief ForumManager class with its methods related to forum functionality
+ * ForumManager class with its methods related to forum functionality
  */
 namespace Friendica\Content;
 
 use Friendica\Core\Protocol;
-use Friendica\Content\Feature;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
 
 /**
- * @brief This class handles methods related to the forum functionality
+ * This class handles methods related to the forum functionality
  */
 class ForumManager
 {
        /**
-        * @brief Function to list all forums a user is connected with
+        * Function to list all forums a user is connected with
         *
         * @param int     $uid         of the profile owner
         * @param boolean $lastitem    Sort by lastitem
@@ -29,11 +27,12 @@ class ForumManager
         * @param boolean $showprivate Show private groups
         *
         * @return array
-        *      'url'   => forum url
-        *      'name'  => forum name
-        *      'id'    => number of the key from the array
-        *      'micro' => contact photo in format micro
-        *      'thumb' => contact photo in format thumb
+        *    'url'    => forum url
+        *    'name'    => forum name
+        *    'id'    => number of the key from the array
+        *    'micro' => contact photo in format micro
+        *    'thumb' => contact photo in format thumb
+        * @throws \Exception
         */
        public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
        {
@@ -43,7 +42,7 @@ class ForumManager
                        $params = ['order' => ['name']];
                }
 
-               $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
+               $condition_str = "`network` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
 
                if ($showprivate) {
                        $condition_str .= '(`forum` OR `prv`)';
@@ -58,7 +57,7 @@ class ForumManager
                $forumlist = [];
 
                $fields = ['id', 'url', 'name', 'micro', 'thumb'];
-               $condition = [$condition_str, Protocol::DFRN, $uid];
+               $condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
                $contacts = DBA::select('contact', $fields, $condition, $params);
                if (!$contacts) {
                        return($forumlist);
@@ -80,7 +79,7 @@ class ForumManager
 
 
        /**
-        * @brief Forumlist widget
+        * Forumlist widget
         *
         * Sidebar widget to show subcribed friendica forums. If activated
         * in the settings, it appears at the notwork page sidebar
@@ -88,6 +87,8 @@ class ForumManager
         * @param int $uid The ID of the User
         * @param int $cid The contact id which is used to mark a forum as "selected"
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function widget($uid, $cid = 0)
        {
@@ -103,16 +104,18 @@ class ForumManager
                if (DBA::isResult($contacts)) {
                        $id = 0;
 
+                       $entries = [];
+
                        foreach ($contacts as $contact) {
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url' => 'network?f=&cid=' . $contact['id'],
+                                       'url' => 'network?cid=' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
                                        'selected'      => $selected,
-                                       'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
+                                       'micro' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
                                        'id' => ++$id,
                                ];
                                $entries[] = $entry;
@@ -123,12 +126,12 @@ class ForumManager
                        $o .= Renderer::replaceMacros(
                                $tpl,
                                [
-                                       '$title'        => L10n::t('Forums'),
+                                       '$title'        => DI::l10n()->t('Forums'),
                                        '$forums'       => $entries,
-                                       '$link_desc'    => L10n::t('External link to forum'),
+                                       '$link_desc'    => DI::l10n()->t('External link to forum'),
                                        '$total'        => $total,
                                        '$visible_forums' => $visible_forums,
-                                       '$showmore'     => L10n::t('show more')]
+                                       '$showmore'     => DI::l10n()->t('show more')]
                        );
                }
 
@@ -136,13 +139,15 @@ class ForumManager
        }
 
        /**
-        * @brief Format forumlist as contact block
+        * Format forumlist as contact block
         *
         * This function is used to show the forumlist in
         * the advanced profile.
         *
         * @param int $uid The ID of the User
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function profileAdvanced($uid)
        {
@@ -164,7 +169,7 @@ class ForumManager
                $total_shown = 0;
                $forumlist = '';
                foreach ($contacts as $contact) {
-                       $forumlist .= HTML::micropro($contact, false, 'forumlist-profile-advanced');
+                       $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
                        $total_shown ++;
                        if ($total_shown == $show_total) {
                                break;
@@ -178,29 +183,29 @@ class ForumManager
        }
 
        /**
-        * @brief count unread forum items
+        * count unread forum items
         *
         * Count unread items of connected forums and private groups
         *
         * @return array
-        *      'id' => contact id
-        *      'name' => contact/forum name
-        *      'count' => counted unseen forum items
+        *    'id' => contact id
+        *    'name' => contact/forum name
+        *    'count' => counted unseen forum items
+        * @throws \Exception
         */
        public static function countUnseenItems()
        {
-               $r = q(
+               $stmtContacts = DBA::p(
                        "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
                                INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
-                               WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
+                               WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
                                AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
                                AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
                                AND NOT `contact`.`pending` AND NOT `contact`.`archive`
-                               AND `contact`.`success_update` > `failure_update`
                                GROUP BY `contact`.`id` ",
-                       intval(local_user())
+                       local_user()
                );
 
-               return $r;
+               return DBA::toArray($stmtContacts);
        }
 }