X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=ac745c50ff672655ea5b16be8c68cf1c9202d3e8;hb=e0a763b07f12ecb7389925100959f9ac6ebe85a8;hp=cfd083f9f8c3821010e1f61d3d77a78d1163f278;hpb=c598bf7d8f5075526fadcfd329f6dd448533dfad;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index cfd083f9f8..ac745c50ff 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,14 +5,15 @@
  */
 namespace Friendica\Content;
 
-use Friendica\App;
+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\DBM;
-use dba;
-
-require_once 'include/dba.php';
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\Proxy as ProxyUtils;
 
 /**
  * @brief This class handles methods related to the forum functionality
@@ -36,30 +37,34 @@ class ForumManager
 	 */
 	public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
 	{
-		$forumlist = [];
+		if ($lastitem) {
+			$params = ['order' => ['last-item' => true]];
+		} else {
+			$params = ['order' => ['name']];
+		}
+
+		$condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
 
-		$order = (($showhidden) ? '' : ' AND NOT `hidden` ');
-		$order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
-		$select = '`forum` ';
 		if ($showprivate) {
-			$select = '(`forum` OR `prv`)';
+			$condition_str .= '(`forum` OR `prv`)';
+		} else {
+			$condition_str .= '`forum`';
 		}
 
-		$contacts = dba::p(
-			"SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb`
-			FROM `contact`
-				WHERE `network`= 'dfrn' AND $select AND `uid` = ?
-				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
-				AND `success_update` > `failure_update`
-			$order ",
-			$uid
-		);
+		if (!$showhidden) {
+			$condition_str .=  ' AND NOT `hidden`';
+		}
 
+		$forumlist = [];
+
+		$fields = ['id', 'url', 'name', 'micro', 'thumb'];
+		$condition = [$condition_str, Protocol::DFRN, $uid];
+		$contacts = DBA::select('contact', $fields, $condition, $params);
 		if (!$contacts) {
 			return($forumlist);
 		}
 
-		while ($contact = dba::fetch($contacts)) {
+		while ($contact = DBA::fetch($contacts)) {
 			$forumlist[] = [
 				'url'	=> $contact['url'],
 				'name'	=> $contact['name'],
@@ -68,7 +73,7 @@ class ForumManager
 				'thumb' => $contact['thumb'],
 			];
 		}
-		dba::close($contacts);
+		DBA::close($contacts);
 
 		return($forumlist);
 	}
@@ -86,10 +91,6 @@ class ForumManager
 	 */
 	public static function widget($uid, $cid = 0)
 	{
-		if (! intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
-			return;
-		}
-
 		$o = '';
 
 		//sort by last updated item
@@ -99,7 +100,7 @@ class ForumManager
 		$total = count($contacts);
 		$visible_forums = 10;
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			$id = 0;
 
 			foreach ($contacts as $contact) {
@@ -107,19 +108,19 @@ class ForumManager
 
 				$entry = [
 					'url' => 'network?f=&cid=' . $contact['id'],
-					'external_url' => 'redir/' . $contact['id'],
+					'external_url' => Contact::magicLink($contact['url']),
 					'name' => $contact['name'],
 					'cid' => $contact['id'],
 					'selected' 	=> $selected,
-					'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
 					'id' => ++$id,
 				];
 				$entries[] = $entry;
 			}
 
-			$tpl = get_markup_template('widget_forumlist.tpl');
+			$tpl = Renderer::getMarkupTemplate('widget_forumlist.tpl');
 
-			$o .= replace_macros(
+			$o .= Renderer::replaceMacros(
 				$tpl,
 				[
 					'$title'	=> L10n::t('Forums'),
@@ -163,7 +164,7 @@ class ForumManager
 		$total_shown = 0;
 		$forumlist = '';
 		foreach ($contacts as $contact) {
-			$forumlist .= micropro($contact, false, 'forumlist-profile-advanced');
+			$forumlist .= HTML::micropro($contact, false, 'forumlist-profile-advanced');
 			$total_shown ++;
 			if ($total_shown == $show_total) {
 				break;