X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=16bffa4ea7edeb1711ae92a8a7893e4a26492a4b;hb=4f3d1e93e97365deac2366bfe422e8301d773a25;hp=8b473f76a4ce789e04921fab786466c9944333a9;hpb=26f6c917a7fd3fd5a4d7daf5ebda12b80b3c6a98;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 8b473f76a4..16bffa4ea7 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -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', + '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)), @@ -94,10 +110,20 @@ class ShowstreamAction extends StreamAction { 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) { @@ -136,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')); @@ -169,6 +203,7 @@ 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', @@ -190,6 +225,7 @@ class ShowstreamAction extends StreamAction { 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', @@ -232,6 +268,11 @@ 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 : @@ -310,35 +351,31 @@ class ShowstreamAction extends StreamAction { common_element_end('div'); } - function show_notices($profile) { - - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - - $notice->orderBy('created DESC, notice.id 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) { @@ -364,15 +401,18 @@ class ShowstreamAction extends StreamAction { function show_notice($notice) { $profile = $notice->getProfile(); - if (common_logged_in()) { - $user = common_current_user(); - $user_profile = $user->getProfile(); - } else { - $user_profile = false; - } + $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'); @@ -390,6 +430,10 @@ class ShowstreamAction extends StreamAction { '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(' ('); @@ -406,13 +450,15 @@ class ShowstreamAction extends StreamAction { 'class' => 'replybutton')); common_raw('→'); common_element_end('a'); - common_element_end('p'); - if ($user_profile && $notice->profile_id == $user_profile->id) { + if ($user && $notice->profile_id == $user->id) { $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); - common_element('a', array('class' => 'deletenotice', - 'href' => $deleteurl), - _('delete')); + 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'); } } \ No newline at end of file