X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FForumManager.php;h=8473035affe43faf33440faa3479f22543c77584;hb=96501bda816bb3db29ea19d89e6ffc0e83f350b3;hp=943d5ff01077273b17fb6c0c140665db1640af39;hpb=f2b690f87636df5f0e929e3582e0e21aa79789d0;p=friendica.git diff --git a/include/ForumManager.php b/include/ForumManager.php index 943d5ff010..8473035aff 100644 --- a/include/ForumManager.php +++ b/include/ForumManager.php @@ -1,8 +1,11 @@ forum name * 'id' => number of the key from the array * 'micro' => contact photo in format micro + * 'thumb' => contact photo in format thumb */ public static function get_list($uid, $showhidden = true, $lastitem, $showprivate = false) { @@ -38,25 +42,28 @@ class ForumManager { $select = '(`forum` OR `prv`)'; } - $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM `contact` - WHERE `network`= 'dfrn' AND $select AND `uid` = %d + $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 `hidden` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` $order ", - intval($uid) + $uid ); if (!$contacts) return($forumlist); - foreach($contacts as $contact) { + while ($contact = dba::fetch($contacts)) { $forumlist[] = array( 'url' => $contact['url'], 'name' => $contact['name'], 'id' => $contact['id'], 'micro' => $contact['micro'], + 'thumb' => $contact['thumb'], ); } + dba::close($contacts); + return($forumlist); } @@ -86,7 +93,7 @@ class ForumManager { $total = count($contacts); $visible_forums = 10; - if(dba::is_result($contacts)) { + if (dbm::is_result($contacts)) { $id = 0; @@ -100,7 +107,7 @@ class ForumManager { 'name' => $contact['name'], 'cid' => $contact['id'], 'selected' => $selected, - 'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)), + 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)), 'id' => ++$id, ); $entries[] = $entry;