From: Adam Magness Date: Tue, 21 Nov 2017 12:20:22 +0000 (-0500) Subject: ForumManager to src X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7cee150868b35bca64c65c3f821232137465d14f;p=friendica.git ForumManager to src ForumManager moved to Friendica\Content namespace --- diff --git a/include/ForumManager.php b/include/ForumManager.php deleted file mode 100644 index 039b4f5d24..0000000000 --- a/include/ForumManager.php +++ /dev/null @@ -1,198 +0,0 @@ - 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 - */ - public static function get_list($uid, $showhidden = true, $lastitem, $showprivate = false) { - - $forumlist = array(); - - $order = (($showhidden) ? '' : ' AND NOT `hidden` '); - $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC '); - $select = '`forum` '; - if ($showprivate) { - $select = '(`forum` OR `prv`)'; - } - - $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 ", - $uid - ); - - if (!$contacts) - return($forumlist); - - 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); - } - - - /** - * @brief Forumlist widget - * - * Sidebar widget to show subcribed friendica forums. If activated - * in the settings, it appears at the notwork page sidebar - * - * @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 - */ - public static function widget($uid,$cid = 0) { - - if(! intval(feature_enabled(local_user(),'forumlist_widget'))) - return; - - $o = ''; - - //sort by last updated item - $lastitem = true; - - $contacts = self::get_list($uid,true,$lastitem, true); - $total = count($contacts); - $visible_forums = 10; - - if (DBM::is_result($contacts)) { - - $id = 0; - - foreach($contacts as $contact) { - - $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); - - $entry = array( - 'url' => 'network?f=&cid=' . $contact['id'], - 'external_url' => 'redir/' . $contact['id'], - 'name' => $contact['name'], - 'cid' => $contact['id'], - 'selected' => $selected, - 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)), - 'id' => ++$id, - ); - $entries[] = $entry; - } - - $tpl = get_markup_template('widget_forumlist.tpl'); - - $o .= replace_macros($tpl,array( - '$title' => t('Forums'), - '$forums' => $entries, - '$link_desc' => t('External link to forum'), - '$total' => $total, - '$visible_forums' => $visible_forums, - '$showmore' => t('show more'), - )); - } - - return $o; - } - - /** - * @brief 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 - * - */ - public static function profile_advanced($uid) { - - $profile = intval(feature_enabled($uid,'forumlist_profile')); - if(! $profile) - return; - - $o = ''; - - // place holder in case somebody wants configurability - $show_total = 9999; - - //don't sort by last updated item - $lastitem = false; - - $contacts = self::get_list($uid,false,$lastitem,false); - - $total_shown = 0; - - foreach($contacts as $contact) { - $forumlist .= micropro($contact,false,'forumlist-profile-advanced'); - $total_shown ++; - if($total_shown == $show_total) - break; - } - - if(count($contacts) > 0) - $o .= $forumlist; - return $o; - } - - /** - * @brief 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 - * - */ - public static function count_unseen_items() { - $r = q("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` - 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()) - ); - - return $r; - } - -} diff --git a/include/identity.php b/include/identity.php index 96a9781335..b8f4727ad8 100644 --- a/include/identity.php +++ b/include/identity.php @@ -4,6 +4,7 @@ */ use Friendica\App; +use Friendica\Content\ForumManager; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\PConfig; @@ -12,7 +13,6 @@ use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Object\Contact; -require_once 'include/ForumManager.php'; require_once 'include/bbcode.php'; require_once 'mod/proxy.php'; @@ -795,7 +795,7 @@ function advanced_profile(App $a) //show subcribed forum if it is enabled in the usersettings if (feature_enabled($uid, 'forumlist_profile')) { - $profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid)); + $profile['forumlist'] = array( t('Forums:'), ForumManager::profileAdvanced($uid)); } if ($a->profile['uid'] == local_user()) { diff --git a/mod/network.php b/mod/network.php index ff86e0b9e4..f58fad6fd2 100644 --- a/mod/network.php +++ b/mod/network.php @@ -1,6 +1,9 @@ page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : ''); - $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? ForumManager::widget(local_user(),$cid) : ''); + $a->page['aside'] .= (feature_enabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : ''); $a->page['aside'] .= posted_date_widget('network',local_user(),false); $a->page['aside'] .= networks_widget('network',(x($_GET, 'nets') ? $_GET['nets'] : '')); $a->page['aside'] .= saved_searches($search); diff --git a/mod/ping.php b/mod/ping.php index c6f67d397d..99d5777ea0 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -3,6 +3,7 @@ * @file include/ping.php */ use Friendica\App; +use Friendica\Content\ForumManager; use Friendica\Core\Cache; use Friendica\Core\System; use Friendica\Core\PConfig; @@ -12,7 +13,6 @@ use Friendica\Util\XML; require_once 'include/datetime.php'; require_once 'include/bbcode.php'; -require_once 'include/ForumManager.php'; require_once 'include/group.php'; require_once 'mod/proxy.php'; require_once 'include/enotify.php'; @@ -162,7 +162,7 @@ function ping_init(App $a) } if (intval(feature_enabled(local_user(), 'forumlist_widget'))) { - $forum_counts = ForumManager::count_unseen_items(); + $forum_counts = ForumManager::countUnseenItems(); if (DBM::is_result($forums_counts)) { foreach ($forums_counts as $forum_count) { if ($forum_count['count'] > 0) { diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php new file mode 100644 index 0000000000..e5d153f759 --- /dev/null +++ b/src/Content/ForumManager.php @@ -0,0 +1,201 @@ + 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 + */ + public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false) + { + $forumlist = array(); + + $order = (($showhidden) ? '' : ' AND NOT `hidden` '); + $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC '); + $select = '`forum` '; + if ($showprivate) { + $select = '(`forum` OR `prv`)'; + } + + $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 ", + $uid + ); + + if (!$contacts) { + return($forumlist); + } + + 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); + } + + + /** + * @brief Forumlist widget + * + * Sidebar widget to show subcribed friendica forums. If activated + * in the settings, it appears at the notwork page sidebar + * + * @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 + */ + public static function widget($uid, $cid = 0) + { + if (! intval(feature_enabled(local_user(), 'forumlist_widget'))) { + return; + } + + $o = ''; + + //sort by last updated item + $lastitem = true; + + $contacts = self::getList($uid, $lastitem, true, true); + $total = count($contacts); + $visible_forums = 10; + + if (DBM::is_result($contacts)) { + $id = 0; + + foreach ($contacts as $contact) { + $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); + + $entry = array( + 'url' => 'network?f=&cid=' . $contact['id'], + 'external_url' => 'redir/' . $contact['id'], + 'name' => $contact['name'], + 'cid' => $contact['id'], + 'selected' => $selected, + 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)), + 'id' => ++$id, + ); + $entries[] = $entry; + } + + $tpl = get_markup_template('widget_forumlist.tpl'); + + $o .= replace_macros( + $tpl, + array( + '$title' => t('Forums'), + '$forums' => $entries, + '$link_desc' => t('External link to forum'), + '$total' => $total, + '$visible_forums' => $visible_forums, + '$showmore' => t('show more')) + ); + } + + return $o; + } + + /** + * @brief 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 + */ + public static function profileAdvanced($uid) + { + $profile = intval(feature_enabled($uid, 'forumlist_profile')); + if (! $profile) { + return; + } + + $o = ''; + + // place holder in case somebody wants configurability + $show_total = 9999; + + //don't sort by last updated item + $lastitem = false; + + $contacts = self::getList($uid, $lastitem, false, false); + + $total_shown = 0; + + foreach ($contacts as $contact) { + $forumlist .= micropro($contact, false, 'forumlist-profile-advanced'); + $total_shown ++; + if ($total_shown == $show_total) { + break; + } + } + + if (count($contacts) > 0) { + $o .= $forumlist; + return $o; + } + } + + /** + * @brief 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 + */ + public static function countUnseenItems() + { + $r = q( + "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` + 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()) + ); + + return $r; + } +} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 40d4d9c734..a8654f743b 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -10,6 +10,7 @@ */ use Friendica\App; +use Friendica\Content\ForumManager; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; @@ -210,9 +211,6 @@ function vier_community_info() { //Community_Pages at right_aside if ($show_pages && local_user()) { - - require_once 'include/ForumManager.php'; - if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { $cid = $_GET['cid']; } @@ -220,16 +218,14 @@ function vier_community_info() { //sort by last updated item $lastitem = true; - $contacts = ForumManager::get_list($a->user['uid'],true,$lastitem, true); + $contacts = ForumManager::getList($a->user['uid'], $lastitem, true, true); $total = count($contacts); $visible_forums = 10; if (count($contacts)) { - $id = 0; foreach ($contacts as $contact) { - $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $entry = array( @@ -247,14 +243,16 @@ function vier_community_info() { $tpl = get_markup_template('widget_forumlist_right.tpl'); - $page .= replace_macros($tpl, array( - '$title' => t('Forums'), - '$forums' => $entries, - '$link_desc' => t('External link to forum'), - '$total' => $total, - '$visible_forums' => $visible_forums, - '$showmore' => t('show more'), - )); + $page .= replace_macros( + $tpl, + array( + '$title' => t('Forums'), + '$forums' => $entries, + '$link_desc' => t('External link to forum'), + '$total' => $total, + '$visible_forums' => $visible_forums, + '$showmore' => t('show more')) + ); $aside['$page'] = $page; }