X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=c66718cfe86ea3e672491b3a68c80d06dcea91e1;hb=182aa9a101f31d476e4e1528f611778ef7f628dc;hp=25baf2fc9da04dc379782a1529764dda5a76ad62;hpb=2fa7ab2f44c73dfb66f4cb175fe3200228d357e0;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 25baf2fc9d..c66718cfe8 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -64,10 +64,14 @@ class ShowstreamAction extends StreamAction { function show_header($user) { common_element('link', array('rel' => 'alternate', - 'href' => common_local_url('rss10', array('nickname' => + 'href' => common_local_url('userrss', array('nickname' => $user->nickname)), 'type' => 'application/rss+xml', 'title' => _t('Notice feed for ') . $user->nickname)); + # for remote subscriptions etc. + common_element('meta', array('http-equiv' => 'X-XRDS-Location', + 'content' => common_local_url('xrds', array('nickname' => + $user->nickname)))); } function no_such_user() { @@ -82,6 +86,8 @@ class ShowstreamAction extends StreamAction { $this->show_last_notice($profile); + $cur = common_current_user(); + if ($cur && $cur->id != $profile->id) { if ($cur->isSubscribed($profile)) { $this->show_unsubscribe_form($profile); @@ -134,7 +140,9 @@ class ShowstreamAction extends StreamAction { 'name' => 'subscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); - common_element('input', array('type' => 'submit', 'value' => _t('Subscribe'))); + common_element('input', array('type' => 'submit', + 'class' => 'button', + 'value' => _t('Subscribe'))); common_element_end('form'); } @@ -145,7 +153,9 @@ class ShowstreamAction extends StreamAction { 'name' => 'unsubscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); - common_element('input', array('type' => 'submit'), _t('Unsubscribe')); + common_element('input', array('type' => 'submit', + 'class' => 'button', + 'value' => _t('Unsubscribe'))); common_element_end('form'); } @@ -153,46 +163,58 @@ class ShowstreamAction extends StreamAction { global $config; # XXX: add a limit - $subs = $profile->getLink('id', 'subscription', 'subscriber'); + $subs = DB_DataObject::factory('subscription'); + $subs->subscriber = $profile->id; + + # We ask for an extra one to know if we need to do another page + + $subs->limit(0, SUBSCRIPTIONS); + + $subs_count = $subs->find(); common_element_start('div', 'subscriptions'); common_element('h2', 'subscriptions', _t('Subscriptions')); - $cnt = 0; - - if ($subs) { - while ($subs->fetch()) { - $cnt++; - if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { - common_element_start('div', 'row'); - } - - common_element_start('a', array('title' => ($subs->fullname) ? - $subs->fullname : - $subs->nickname, - 'href' => $subs->profileurl, - 'class' => 'subscription')); - $avatar = $subs->getAvatar(AVATAR_MINI_SIZE); - common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']), - 'width' => AVATAR_MINI_SIZE, - 'height' => AVATAR_MINI_SIZE, - 'class' => 'avatar mini', - 'alt' => ($subs->fullname) ? - $subs->fullname : - $subs->nickname)); - common_element_end('a'); - - if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { - common_element_end('div'); - } - - if ($cnt == SUBSCRIPTIONS) { - break; - } + $idx = 0; + + while ($subs->fetch()) { + $idx++; + if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { + common_element_start('div', 'row'); + } + + $other = Profile::staticGet($subs->subscribed); + + common_element_start('a', array('title' => ($other->fullname) ? + $other->fullname : + $other->nickname, + 'href' => $other->profileurl, + 'class' => 'subscription')); + $avatar = $other->getAvatar(AVATAR_MINI_SIZE); + common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE)), + 'width' => AVATAR_MINI_SIZE, + 'height' => AVATAR_MINI_SIZE, + 'class' => 'avatar mini', + 'alt' => ($other->fullname) ? + $other->fullname : + $other->nickname)); + common_element_end('a'); + + if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { + common_element_end('div'); + } + + if ($idx == SUBSCRIPTIONS) { + break; } } + # close any unclosed row + if ($idx % SUBSCRIPTIONS_PER_ROW != 0) { + common_element_end('div'); + } + common_element('a', array('href' => common_local_url('subscriptions', array('nickname' => $profile->nickname)), 'class' => 'moresubscriptions'), @@ -206,27 +228,15 @@ class ShowstreamAction extends StreamAction { // XXX: WORM cache this $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; - $subs_count = $subs->count(); - - if (!$subs_count) { - $subs_count = 0; - } + $subs_count = (int) $subs->count(); $subbed = DB_DataObject::factory('subscription'); $subbed->subscribed = $profile->id; - $subbed_count = $subbed->count(); - - if (!$subbed_count) { - $subbed_count = 0; - } + $subbed_count = (int) $subbed->count(); $notices = DB_DataObject::factory('notice'); $notices->profile_id = $profile->id; - $notice_count = $notices->count(); - - if (!$notice_count) { - $notice_count = 0; - } + $notice_count = (int) $notices->count(); common_element_start('div', 'statistics'); common_element('h2', 'statistics', _t('Statistics')); @@ -251,21 +261,46 @@ class ShowstreamAction extends StreamAction { $notice->orderBy('created DESC'); - $page = $this->arg('page') || 1; + $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE); + $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); - $notice->find(); + $cnt = $notice->find(); common_element_start('div', 'notices width66 floatLeft'); common_element_start('ul', 'bigLinks'); - - while ($notice->fetch()) { - $this->show_notice($notice); + + for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { + if ($notice->fetch()) { + $this->show_notice($notice); + } else { + // shouldn't happen! + break; + } } common_element_end('ul'); + + if ($page > 1) { + common_element_start('span', 'floatLeft width25'); + common_element('a', array('href' => common_local_url('showstream', + array('nickname' => $profile->nickname, + 'page' => $page-1)), + 'class' => 'newer'), + _t('Newer')); + common_element_end('span'); + } + + if ($cnt > NOTICES_PER_PAGE) { + common_element_start('span', 'floatRight width25'); + common_element('a', array('href' => common_local_url('showstream', + array('nickname' => $profile->nickname, + 'page' => $page+1)), + 'class' => 'older'), + _t('Older')); + common_element_end('span'); + } # XXX: show a link for the next page common_element_end('div');