X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=16bffa4ea7edeb1711ae92a8a7893e4a26492a4b;hb=485247e9011e08a6ff0b9a2ff3d7a60bad515a26;hp=d4f70fbd0097af840a3cd845a153868afe67a383;hpb=66b1f3f233f8c481fa7b37a46aecf9c7bb2f60a0;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index d4f70fbd00..16bffa4ea7 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 has no profile.')); return; } @@ -58,7 +58,7 @@ class ShowstreamAction extends StreamAction { $this->show_profile($profile); - $this->show_notices($profile); + $this->show_notices($user); common_show_footer(); } @@ -75,11 +75,27 @@ class ShowstreamAction extends StreamAction { } function show_header($user) { + # Feeds + common_element('link', array('rel' => 'alternate', + 'href' => common_local_url('api', + array('apiaction' => 'statuses', + 'method' => 'user_timeline.rss', + 'argument' => $user->nickname)), + 'type' => 'application/rss+xml', + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); + common_element('link', array('rel' => 'alternate feed', + 'href' => common_local_url('api', + array('apiaction' => 'statuses', + 'method' => 'user_timeline.atom', + 'argument' => $user->nickname)), + 'type' => 'application/atom+xml', + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); 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)); + 'type' => 'application/rdf+xml', + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); + # FOAF common_element('link', array('rel' => 'meta', 'href' => common_local_url('foaf', array('nickname' => $user->nickname)), @@ -89,10 +105,25 @@ class ShowstreamAction extends StreamAction { common_element('meta', array('http-equiv' => 'X-XRDS-Location', 'content' => common_local_url('xrds', array('nickname' => $user->nickname)))); + $profile = $user->getProfile(); + if ($profile->bio) { + common_element('meta', array('name' => 'description', + 'content' => $profile->bio)); + } + + if ($user->emailmicroid && $user->email && $profile->profileurl) { + common_element('meta', array('name' => 'microid', + 'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl)))); + } + if ($user->jabbermicroid && $user->jabber && $profile->profileurl) { + common_element('meta', array('name' => 'microid', + 'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl)))); + } + } function no_such_user() { - common_user_error('No such user'); + $this->client_error(_('No such user.'), 404); } function show_profile($profile) { @@ -131,6 +162,14 @@ class ShowstreamAction extends StreamAction { } else { $this->show_remote_subscribe_link($profile); } + + $user = User::staticGet('id', $profile->id); + + if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { + common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))), + _('Send a message')); + } + common_element_end('div'); common_element_start('div', array('id' => 'profile_information')); @@ -141,7 +180,7 @@ class ShowstreamAction extends StreamAction { common_element('h1', NULL, $profile->nickname); } - + if ($profile->location) { common_element('p', 'location', $profile->location); } @@ -150,7 +189,8 @@ class ShowstreamAction extends StreamAction { } if ($profile->homepage) { common_element_start('p', 'website'); - common_element('a', array('href' => $profile->homepage), + common_element('a', array('href' => $profile->homepage, + 'rel' => 'me'), $profile->homepage); common_element_end('p'); } @@ -163,13 +203,14 @@ class ShowstreamAction extends StreamAction { function show_subscribe_form($profile) { common_element_start('form', array('id' => 'subscribe', 'method' => 'post', 'action' => common_local_url('subscribe'))); + common_hidden('token', common_session_token()); common_element('input', array('id' => 'subscribeto', 'name' => 'subscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit', 'class' => 'submit', - 'value' => _t('Subscribe'))); + 'value' => _('Subscribe'))); common_element_end('form'); } @@ -178,19 +219,20 @@ class ShowstreamAction extends StreamAction { array('nickname' => $profile->nickname)); common_element('a', array('href' => $url, 'id' => 'remotesubscribe'), - _t('Subscribe')); + _('Subscribe')); } function show_unsubscribe_form($profile) { common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post', 'action' => common_local_url('unsubscribe'))); + common_hidden('token', common_session_token()); common_element('input', array('id' => 'unsubscribeto', 'name' => 'unsubscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit', 'class' => 'submit', - 'value' => _t('Unsubscribe'))); + 'value' => _('Unsubscribe'))); common_element_end('form'); } @@ -199,6 +241,8 @@ class ShowstreamAction extends StreamAction { $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; + $subs->whereAdd('subscribed != ' . $profile->id); + $subs->orderBy('created DESC'); # We ask for an extra one to know if we need to do another page @@ -209,7 +253,7 @@ class ShowstreamAction extends StreamAction { common_element_start('div', array('id' => 'subscriptions')); - common_element('h2', NULL, _t('Subscriptions')); + common_element('h2', NULL, _('Subscriptions')); if ($subs_count > 0) { @@ -224,11 +268,17 @@ class ShowstreamAction extends StreamAction { $other = Profile::staticGet($subs->subscribed); + if (!$other) { + common_log_db_error($subs, 'SELECT', __FILE__); + continue; + } + common_element_start('li'); common_element_start('a', array('title' => ($other->fullname) ? $other->fullname : $other->nickname, 'href' => $other->profileurl, + 'rel' => 'contact', 'class' => 'subscription')); $avatar = $other->getAvatar(AVATAR_MINI_SIZE); common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), @@ -251,7 +301,7 @@ class ShowstreamAction extends StreamAction { common_element('a', array('href' => common_local_url('subscriptions', array('nickname' => $profile->nickname)), 'class' => 'moresubscriptions'), - _t('All subscriptions')); + _('All subscriptions')); common_element_end('p'); } @@ -263,85 +313,78 @@ class ShowstreamAction extends StreamAction { // XXX: WORM cache this $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; - $subs_count = (int) $subs->count(); + $subs_count = (int) $subs->count() - 1; $subbed = DB_DataObject::factory('subscription'); $subbed->subscribed = $profile->id; - $subbed_count = (int) $subbed->count(); + $subbed_count = (int) $subbed->count() - 1; $notices = DB_DataObject::factory('notice'); $notices->profile_id = $profile->id; $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', 'membersince', _t('Member since')); - common_element('dd', 'membersince', date('j M Y', + 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))), - _t('Subscriptions')); + _('Subscriptions')); common_element_end('dt'); - common_element('dd', 'subscriptions', $subs_count); + 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))), - _t('Subscribers')); + _('Subscribers')); common_element_end('dt'); - common_element('dd', 'subscribers', $subbed_count); - common_element('dt', 'notices', _t('Notices')); - common_element('dd', 'notices', $notice_count); + 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'); } - function show_notices($profile) { - - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - - $notice->orderBy('created DESC'); + function show_notices($user) { $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); - - $cnt = $notice->find(); + $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + $cnt = 0; - if ($cnt > 0) { + if ($notice) { + common_element_start('ul', array('id' => 'notices')); - - for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { - if ($notice->fetch()) { - $this->show_notice($notice); - } else { - // shouldn't happen! + + while ($notice->fetch()) { + $cnt++; + if ($cnt > NOTICES_PER_PAGE) { break; } + $this->show_notice($notice); } common_element_end('ul'); } + common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page, - 'showstream', array('nickname' => $profile->nickname)); + 'showstream', array('nickname' => $user->nickname)); } 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')); if ($notice->rendered) { @@ -358,35 +401,63 @@ class ShowstreamAction extends StreamAction { function show_notice($notice) { $profile = $notice->getProfile(); + $user = common_current_user(); + # XXX: RDFa common_element_start('li', array('class' => 'notice_single', 'id' => 'notice-' . $notice->id)); + if ($user) { + if ($user->hasFave($notice)) { + common_disfavor_form($notice); + } else { + common_favor_form($notice); + } + } $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' => 'permalink', 'href' => $noticeurl, 'title' => common_exact_date($notice->created)), common_date_string($notice->created)); + if ($notice->source) { + common_text(_(' from ')); + $this->source_link($notice->source); + } if ($notice->reply_to) { $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); common_text(' ('); common_element('a', array('class' => 'inreplyto', 'href' => $replyurl), - _t('in reply to...')); + _('in reply to...')); common_text(')'); } - common_element_start('a', + common_element_start('a', array('href' => common_local_url('newnotice', array('replyto' => $profile->nickname)), 'onclick' => 'doreply("'.$profile->nickname.'"); return false', - 'title' => _t('reply'), + 'title' => _('reply'), 'class' => 'replybutton')); common_raw('→'); common_element_end('a'); + if ($user && $notice->profile_id == $user->id) { + $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); + common_element_start('a', array('class' => 'deletenotice', + 'href' => $deleteurl, + 'title' => _('delete'))); + common_raw('×'); + common_element_end('a'); + } common_element_end('p'); common_element_end('li'); }