X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=bd64a7be4af48b813363ea2789270bfe2d01222b;hb=800c2e9a094681eff82aacdba6e5d22d547c4950;hp=f8446e008a67dbc655f2b412928b6122edccd6c4;hpb=e4534d60be73634ac49a1ac1f57ecc7bf8ccb1e8;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index f8446e008a..bd64a7be4a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -41,7 +41,7 @@ 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; } @@ -52,7 +52,9 @@ class ShowstreamAction extends StreamAction { header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' => $user->nickname))); - common_show_header($profile->nickname, array($this, 'show_header'), $user); + common_show_header($profile->nickname, + array($this, 'show_header'), $user, + array($this, 'show_top')); $this->show_profile($profile); @@ -61,12 +63,23 @@ class ShowstreamAction extends StreamAction { 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('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)), @@ -79,7 +92,7 @@ class ShowstreamAction extends StreamAction { } function no_such_user() { - common_user_error('No such user'); + common_user_error(_('No such user.')); } function show_profile($profile) { @@ -100,112 +113,114 @@ class ShowstreamAction extends StreamAction { function show_personal($profile) { $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); - if ($avatar) { - common_element_start('div', array('id' => 'profile_avatar')); - common_element('img', array('src' => $avatar->url, - '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); - } + 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_form($profile); } - common_element_end('div'); + } else { + $this->show_remote_subscribe_link($profile); } + common_element_end('div'); + common_element_start('div', array('id' => 'profile_information')); - + if ($profile->fullname) { - common_element('h1', NULL, $profile->fullname); + common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')'); + } else { + common_element('h1', NULL, $profile->nickname); } + + if ($profile->location) { common_element('p', 'location', $profile->location); } if ($profile->bio) { - common_element('p', 'description', htmlspecialchars($profile->bio)); + common_element('p', 'description', $profile->bio); } if ($profile->homepage) { - common_element('p', 'website', $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_form($profile) { - common_element_start('form', array('id' => 'remotesubscribe', - 'method' => 'POST', - 'action' => common_local_url('remotesubscribe'))); - common_hidden('nickname', $profile->nickname); - common_element('input', array('name' => 'profile', - 'type' => 'text', - 'id' => 'profile', - 'size' => '15')); - common_element('input', array('type' => 'submit', - 'id' => 'submit', - 'name' => 'submit', - 'value' => _t('Subscribe'), - 'class' => 'button')); - 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', array('id' => 'subscriptions')); - common_element('h2', NULL, _t('Subscriptions')); + common_element('h2', NULL, _('Subscriptions')); if ($subs_count > 0) { - + common_element_start('ul', array('id' => 'subscriptions_avatars')); - - while ($subs->fetch()) { + + for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) { + + if (!$subs->fetch()) { + common_debug('Weirdly, broke out of subscriptions loop early', __FILE__); + break; + } $other = Profile::staticGet($subs->subscribed); @@ -216,7 +231,7 @@ class ShowstreamAction extends StreamAction { '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)), + 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', @@ -226,18 +241,20 @@ class ShowstreamAction extends StreamAction { common_element_end('a'); common_element_end('li'); } + common_element_end('ul'); } - common_element_start('p', array('id' => 'subscriptions_viewall')); - - 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('p'); - common_element_end('div'); } @@ -257,16 +274,28 @@ class ShowstreamAction extends StreamAction { $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'); @@ -287,7 +316,7 @@ class ShowstreamAction extends StreamAction { if ($cnt > 0) { common_element_start('ul', array('id' => 'notices')); - + for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { if ($notice->fetch()) { $this->show_notice($notice); @@ -296,7 +325,7 @@ class ShowstreamAction extends StreamAction { break; } } - + common_element_end('ul'); } common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page, @@ -305,17 +334,21 @@ class ShowstreamAction extends StreamAction { function show_last_notice($profile) { - common_element('h2', NULL, _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_start('p', array('class' => 'notice_current')); - common_raw(common_render_content($notice->content, $notice)); + 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'); } } @@ -328,13 +361,37 @@ class ShowstreamAction extends StreamAction { $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); # FIXME: URL, image, video, audio common_element_start('p'); - common_raw(common_render_content($notice->content, $notice)); + 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' => 'notice', - 'href' => $noticeurl), + 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