X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=af2c3725c40700f6a3d068d6f348fb4a3c72de1f;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=7b947359a6521a246b1ebcba64e3f35f4ffb0f9d;hpb=ef1813b88ed48daef68ef801cb959cd81ac20ca5;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 7b947359a6..af2c3725c4 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -6,7 +6,6 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Protocol;
-use Friendica\Content\Feature;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -15,8 +14,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class handles methods related to the forum functionality
  */
@@ -31,11 +28,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)
 	{
@@ -90,6 +88,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)
 	{
@@ -105,6 +105,8 @@ class ForumManager
 		if (DBA::isResult($contacts)) {
 			$id = 0;
 
+			$entries = [];
+
 			foreach ($contacts as $contact) {
 				$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
@@ -145,6 +147,8 @@ class ForumManager
 	 *
 	 * @param int $uid The ID of the User
 	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function profileAdvanced($uid)
 	{
@@ -166,7 +170,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;
@@ -185,24 +189,25 @@ class ForumManager
 	 * 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);
 	}
 }