X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=5650038b340f403137f70c1ce4e474e489966dbb;hb=f2e3021b59f3661b3c900b06600a580b8970df2f;hp=bd64a7be4af48b813363ea2789270bfe2d01222b;hpb=8c1678c0f1d1c8c85a65cab9dfd1d1cf588952fd;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index bd64a7be4a..5650038b34 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(_('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(); } @@ -89,10 +89,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 +146,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')); @@ -150,7 +173,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,6 +187,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', @@ -184,6 +209,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', @@ -199,6 +225,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 @@ -224,11 +252,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)), @@ -263,11 +297,11 @@ 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; @@ -301,35 +335,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'); + function show_notices($user) { $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); + $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + $cnt = 0; - $cnt = $notice->find(); - - 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) { @@ -355,9 +385,18 @@ 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'); @@ -375,6 +414,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(' ('); @@ -391,6 +434,14 @@ class ShowstreamAction extends StreamAction { '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'); }