X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=bd64a7be4af48b813363ea2789270bfe2d01222b;hb=800c2e9a094681eff82aacdba6e5d22d547c4950;hp=984c2454b16202419b4d47a23d25e1180479caf0;hpb=0f0d50f06a841e4faed475aa5f73f8bc08bb3a39;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 984c2454b1..bd64a7be4a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/stream.php'); -define('SUBSCRIPTIONS_PER_ROW', 5); +define('SUBSCRIPTIONS_PER_ROW', 4); define('SUBSCRIPTIONS', 80); class ShowstreamAction extends StreamAction { @@ -41,175 +41,219 @@ class ShowstreamAction extends StreamAction { $profile = $user->getProfile(); if (!$profile) { - common_server_error(_t('User record exists without profile.')); + common_server_error(_('User record exists without profile.')); return; } - # Looks like we're good; show the header + # Looks like we're good; start output - common_show_header($profile->nickname, array($this, 'show_header'), $user); + # For YADIS discovery, we also have a tag - $cur = common_current_user(); + header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' => + $user->nickname))); - if ($cur && $profile->id == $cur->id) { - common_notice_form(); - } + common_show_header($profile->nickname, + array($this, 'show_header'), $user, + array($this, 'show_top')); + + $this->show_profile($profile); - $this->show_sidebar($profile); - $this->show_notices($profile); - + common_show_footer(); } + function show_top($user) { + + $cur = common_current_user(); + + if ($cur && $cur->id == $user->id) { + common_notice_form('showstream'); + } + + $this->views_menu(); + } + 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)); + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); + common_element('link', array('rel' => 'meta', + 'href' => common_local_url('foaf', array('nickname' => + $user->nickname)), + 'type' => 'application/rdf+xml', + 'title' => 'FOAF')); + # 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() { - common_user_error('No such user'); + common_user_error(_('No such user.')); } - function show_sidebar($profile) { + function show_profile($profile) { - common_element_start('div', 'sidebar width33 floatRight greenBg'); + common_element_start('div', array('id' => 'profile')); - $this->show_profile($profile); + $this->show_personal($profile); $this->show_last_notice($profile); $cur = common_current_user(); - if ($cur && $cur->id != $profile->id) { - if ($cur->isSubscribed($profile)) { - $this->show_unsubscribe_form($profile); - } else { - $this->show_subscribe_form($profile); - } - } - - $this->show_statistics($profile); - $this->show_subscriptions($profile); common_element_end('div'); } - - function show_profile($profile) { - common_element_start('div', 'profile'); + + function show_personal($profile) { $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); - if ($avatar) { - common_element('img', array('src' => $avatar->url, - 'class' => 'avatar profile', - 'width' => AVATAR_PROFILE_SIZE, - 'height' => AVATAR_PROFILE_SIZE, - 'alt' => $profile->nickname)); + common_element_start('div', array('id' => 'profile_avatar')); + common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), + 'class' => 'avatar profile', + 'width' => AVATAR_PROFILE_SIZE, + 'height' => AVATAR_PROFILE_SIZE, + 'alt' => $profile->nickname)); + $cur = common_current_user(); + if ($cur) { + if ($cur->id != $profile->id) { + if ($cur->isSubscribed($profile)) { + $this->show_unsubscribe_form($profile); + } else { + $this->show_subscribe_form($profile); + } + } + } else { + $this->show_remote_subscribe_link($profile); } + common_element_end('div'); + + common_element_start('div', array('id' => 'profile_information')); + if ($profile->fullname) { - common_element_start('div', 'fullname'); - if ($profile->homepage) { - common_element('a', array('href' => $profile->homepage), - $profile->fullname); - } else { - common_text($profile->fullname); - } - common_element_end('div'); + common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')'); + } else { + common_element('h1', NULL, $profile->nickname); } + + if ($profile->location) { - common_element('div', 'location', $profile->location); + common_element('p', 'location', $profile->location); } if ($profile->bio) { - common_element('div', 'bio', $profile->bio); + common_element('p', 'description', $profile->bio); + } + if ($profile->homepage) { + common_element_start('p', 'website'); + common_element('a', array('href' => $profile->homepage), + $profile->homepage); + common_element_end('p'); } + + $this->show_statistics($profile); + common_element_end('div'); } function show_subscribe_form($profile) { - common_element_start('form', array('id' => 'subscribe', 'method' => 'POST', + common_element_start('form', array('id' => 'subscribe', 'method' => 'post', 'action' => common_local_url('subscribe'))); common_element('input', array('id' => 'subscribeto', 'name' => 'subscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit', - 'class' => 'button', - 'value' => _t('Subscribe'))); + 'class' => 'submit', + 'value' => _('Subscribe'))); common_element_end('form'); } + function show_remote_subscribe_link($profile) { + $url = common_local_url('remotesubscribe', + array('nickname' => $profile->nickname)); + common_element('a', array('href' => $url, + 'id' => 'remotesubscribe'), + _('Subscribe')); + } + function show_unsubscribe_form($profile) { - common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST', + common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post', 'action' => common_local_url('unsubscribe'))); common_element('input', array('id' => 'unsubscribeto', 'name' => 'unsubscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit', - 'class' => 'button', - 'value' => _t('Unsubscribe'))); + 'class' => 'submit', + 'value' => _('Unsubscribe'))); common_element_end('form'); } function show_subscriptions($profile) { global $config; - - # XXX: add a limit + $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; + $subs->orderBy('created DESC'); # We ask for an extra one to know if we need to do another page - $subs->limit(0, SUBSCRIPTIONS); + $subs->limit(0, SUBSCRIPTIONS + 1); $subs_count = $subs->find(); - common_element_start('div', 'subscriptions'); + common_element_start('div', array('id' => 'subscriptions')); + + common_element('h2', NULL, _('Subscriptions')); - common_element('h2', 'subscriptions', _t('Subscriptions')); + if ($subs_count > 0) { - $cnt = 0; + common_element_start('ul', array('id' => 'subscriptions_avatars')); - if ($subs) { - while ($subs->fetch()) { - $cnt++; - if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { - common_element_start('div', 'row'); + for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) { + + if (!$subs->fetch()) { + common_debug('Weirdly, broke out of subscriptions loop early', __FILE__); + break; } - common_element_start('a', array('title' => ($subs->fullname) ? - $subs->fullname : - $subs->nickname, - 'href' => $subs->profileurl, + $other = Profile::staticGet($subs->subscribed); + + common_element_start('li'); + common_element_start('a', array('title' => ($other->fullname) ? + $other->fullname : + $other->nickname, + 'href' => $other->profileurl, 'class' => 'subscription')); - $avatar = $subs->getAvatar(AVATAR_MINI_SIZE); - common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE)), + $avatar = $other->getAvatar(AVATAR_MINI_SIZE); + common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, 'class' => 'avatar mini', - 'alt' => ($subs->fullname) ? - $subs->fullname : - $subs->nickname)); + 'alt' => ($other->fullname) ? + $other->fullname : + $other->nickname)); common_element_end('a'); - - if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { - common_element_end('div'); - } - - if ($cnt == SUBSCRIPTIONS) { - break; - } + common_element_end('li'); } + + common_element_end('ul'); } - common_element('a', array('href' => common_local_url('subscriptions', - array('nickname' => $profile->nickname)), - 'class' => 'moresubscriptions'), - _t('All subscriptions')); + if ($subs_count > SUBSCRIPTIONS) { + common_element_start('p', array('id' => 'subscriptions_viewall')); + + common_element('a', array('href' => common_local_url('subscriptions', + array('nickname' => $profile->nickname)), + 'class' => 'moresubscriptions'), + _('All subscriptions')); + common_element_end('p'); + } common_element_end('div'); } @@ -219,39 +263,39 @@ 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')); + common_element('h2', 'statistics', _('Statistics')); # Other stats...? common_element_start('dl', 'statistics'); - common_element('dt', 'subscriptions', _t('Subscriptions')); - common_element('dd', 'subscriptions', $subs_count); - common_element('dt', 'subscribers', _t('Subscribers')); - common_element('dd', 'subscribers', $subbed_count); - common_element('dt', 'notices', _t('Notices')); - common_element('dd', 'notices', $notice_count); + common_element('dt', 'membersince', _('Member since')); + common_element('dd', 'membersince', date('j M Y', + strtotime($profile->created))); + + common_element_start('dt', 'subscriptions'); + common_element('a', array('href' => common_local_url('subscriptions', + array('nickname' => $profile->nickname))), + _('Subscriptions')); + common_element_end('dt'); + common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0'); + common_element_start('dt', 'subscribers'); + common_element('a', array('href' => common_local_url('subscribers', + array('nickname' => $profile->nickname))), + _('Subscribers')); + common_element_end('dt'); + common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0'); + common_element('dt', 'notices', _('Notices')); + common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0'); common_element_end('dl'); common_element_end('div'); @@ -264,57 +308,90 @@ 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 + 1); - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE); + $cnt = $notice->find(); - $notice->find(); + if ($cnt > 0) { + common_element_start('ul', array('id' => 'notices')); - common_element_start('div', 'notices width66 floatLeft'); + for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { + if ($notice->fetch()) { + $this->show_notice($notice); + } else { + // shouldn't happen! + break; + } + } - common_element_start('ul', 'bigLinks'); - - while ($notice->fetch()) { - $this->show_notice($notice); + common_element_end('ul'); } - - common_element_end('ul'); - - # XXX: show a link for the next page - common_element_end('div'); + common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page, + 'showstream', array('nickname' => $profile->nickname)); } function show_last_notice($profile) { - common_element_start('div', 'lastnotice'); - common_element('h2', 'lastnotice', _t('Currently')); + common_element('h2', NULL, _('Currently')); - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - $notice->orderBy('created DESC'); - $notice->limit(0, 1); + $notice = $profile->getCurrentNotice(); - if ($notice->find(true)) { + if ($notice) { # FIXME: URL, image, video, audio - common_element('span', array('class' => 'content'), - $notice->content); + common_element_start('p', array('class' => 'notice_current')); + if ($notice->rendered) { + common_raw($notice->rendered); + } else { + # XXX: may be some uncooked notices in the DB, + # we cook them right now. This can probably disappear in future + # versions (>> 0.4.x) + common_raw(common_render_content($notice->content, $notice)); + } + common_element_end('p'); } - - common_element_end('div'); } - + function show_notice($notice) { $profile = $notice->getProfile(); # XXX: RDFa - common_element_start('li', array('class' => 'notice', + common_element_start('li', array('class' => 'notice_single', 'id' => 'notice-' . $notice->id)); $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); # FIXME: URL, image, video, audio - common_element_start('a', array('class' => 'notice', - 'href' => $noticeurl)); - common_element('span', 'title', common_date_string($notice->created)); - common_element('span', 'desc', $notice->content); + common_element_start('p'); + if ($notice->rendered) { + common_raw($notice->rendered); + } else { + # XXX: may be some uncooked notices in the DB, + # we cook them right now. This can probably disappear in future + # versions (>> 0.4.x) + common_raw(common_render_content($notice->content, $notice)); + } + common_element_end('p'); + common_element_start('p', array('class' => 'time')); + common_element('a', array('class' => 'permalink', + 'href' => $noticeurl, + 'title' => common_exact_date($notice->created)), + common_date_string($notice->created)); + if ($notice->reply_to) { + $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); + common_text(' ('); + common_element('a', array('class' => 'inreplyto', + 'href' => $replyurl), + _('in reply to...')); + common_text(')'); + } + common_element_start('a', + array('href' => common_local_url('newnotice', + array('replyto' => $profile->nickname)), + 'onclick' => 'doreply("'.$profile->nickname.'"); return false', + 'title' => _('reply'), + 'class' => 'replybutton')); + common_raw('→'); common_element_end('a'); + common_element_end('p'); common_element_end('li'); } -} +} \ No newline at end of file