diff options
| -rw-r--r-- | actions/favorited.php | 2 | ||||
| -rw-r--r-- | actions/featured.php | 68 |
2 files changed, 34 insertions, 36 deletions
diff --git a/actions/favorited.php b/actions/favorited.php index 081c13df8..78749a3ab 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -89,7 +89,7 @@ class FavoritedAction extends StreamAction { $notice = new Notice(); $notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)', - implode($notice_list, ','))); + implode(',', $notice_list))); $cnt = 0; diff --git a/actions/featured.php b/actions/featured.php index d5cfd06f5..63ba8a071 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -20,6 +20,7 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/stream.php'); +require_once(INSTALLDIR.'/lib/profilelist.php'); class FeaturedAction extends StreamAction { @@ -46,61 +47,58 @@ class FeaturedAction extends StreamAction { $this->public_views_menu(); } + function show_header() { + } + function get_instructions() { return _('Featured users'); } - function show_header() { + function show_notices($page) { - // XXX need to make the RSS feed for this + // XXX: Note I'm doing it this two-stage way because a raw query + // with a JOIN was *not* working. --Zach - //common_element('link', array('rel' => 'alternate', - // 'href' => common_local_url('featuredrss'), - // 'type' => 'application/rss+xml', - // 'title' => _('Featured Stream Feed'))); + $featured_nicks = common_config('nickname', 'featured'); - } + if (count($featured_nicks) > 0) { - function show_notices($page) { + $quoted = array(); - $featured = common_config('nickname', 'featured'); + foreach ($featured_nicks as $nick) { + $quoted[] = "'$nick'"; + } - if (count($featured) > 0) { + $user = new User; + $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted))); + $user->limit(($page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1); + $user->orderBy('user.nickname ASC'); - $id_list = array(); + $user->find(); - foreach($featured as $featuree) { - $profile = Profile::staticGet('nickname', trim($featuree)); - array_push($id_list, $profile->id); - } + $profile_ids = array(); - // XXX: Show a list of users (people list) instead of shit crap + while ($user->fetch()) { + $profile_ids[] = $user->id; + common_debug("id = $user->id"); + } - $qry = - 'SELECT * ' . - 'FROM notice ' . - 'WHERE profile_id IN (%s) '; + $profile = new Profile; + $profile->whereAdd(sprintf('profile.id IN (%s)', implode(',', $profile_ids))); + $profile->orderBy('nickname ASC'); - $cnt = 0; + $cnt = $profile->find(); - $notice = Notice::getStream(sprintf($qry, implode($id_list, ',')), - 'featured_stream', ($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + common_debug("count = $cnt"); - if ($notice) { - common_element_start('ul', array('id' => 'notices')); - while ($notice->fetch()) { - $cnt++; - if ($cnt > NOTICES_PER_PAGE) { - break; - } - $this->show_notice($notice); - } - common_element_end('ul'); + if ($cnt > 0) { + $featured = new ProfileList($profile); + $featured->show_list(); } - common_pagination($page > 1, $cnt > NOTICES_PER_PAGE, - $page, 'featured'); + $profile->free(); + common_pagination($page > 1, $cnt > PROFILES_PER_PAGE, $page, 'featured'); } } |