X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticelistitem.php;h=f46827d1f739206881eb7784b9c6d63761f82d53;hb=d596513e390a4b32101f0f486d0ecf388b4aee70;hp=05b0dab16ee806baf78d93fa1720af61b3fcaa43;hpb=b1cc12af2ce66d1066c7543c9797b1fba9faf88f;p=quix0rs-gnu-social.git diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php index 05b0dab16e..f46827d1f7 100644 --- a/lib/noticelistitem.php +++ b/lib/noticelistitem.php @@ -28,11 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * widget for displaying a single notice @@ -69,11 +65,11 @@ class NoticeListItem extends Widget * * @param Notice $notice The notice we'll display */ - function __construct($notice, $out=null) + function __construct(Notice $notice, HTMLOutputter $out=null) { parent::__construct($out); if (!empty($notice->repeat_of)) { - $original = Notice::staticGet('id', $notice->repeat_of); + $original = Notice::getKV('id', $notice->repeat_of); if (empty($original)) { // could have been deleted $this->notice = $notice; } else { @@ -130,7 +126,9 @@ class NoticeListItem extends Widget $this->showNoticeLink(); $this->showNoticeSource(); $this->showNoticeLocation(); - $this->showContext(); + if ($this->notice->hasConversation()) { + $this->showContext(); + } $this->showRepeat(); Event::handle('EndShowNoticeInfo', array($this)); } @@ -144,10 +142,13 @@ class NoticeListItem extends Widget $user = common_current_user(); if ($user) { $this->out->elementStart('div', 'notice-options'); - $this->showFaveForm(); - $this->showReplyLink(); - $this->showRepeatForm(); - $this->showDeleteLink(); + if (Event::handle('StartShowNoticeOptionItems', array($this))) { + $this->showFaveForm(); + $this->showReplyLink(); + $this->showRepeatForm(); + $this->showDeleteLink(); + Event::handle('EndShowNoticeOptionItems', array($this)); + } $this->out->elementEnd('div'); } Event::handle('EndShowNoticeOptions', array($this)); @@ -167,6 +168,9 @@ class NoticeListItem extends Widget if ($this->notice->scope != 0 && $this->notice->scope != 1) { $class .= ' limited-scope'; } + if (!empty($this->notice->source)) { + $class .= ' notice-source-'.$this->notice->source; + } $this->out->elementStart('li', array('class' => $class, 'id' => 'notice-' . $id)); Event::handle('EndOpenNoticeListItemElement', array($this)); @@ -216,8 +220,7 @@ class NoticeListItem extends Widget $this->out->elementStart('a', $attrs); $this->showAvatar(); $this->out->text(' '); - $this->out->element('span',array('class' => 'fn'), - $this->profile->getBestName()); + $this->out->element('span',array('class' => 'fn'), $this->profile->getStreamName()); $this->out->elementEnd('a'); $this->out->elementEnd('span'); @@ -229,59 +232,42 @@ class NoticeListItem extends Widget function showAddressees() { - $this->out->elementStart('span', 'addressees'); - - $cnt = $this->showGroupAddressees(true); - $cnt = $this->showProfileAddressees($cnt == 0); - - $this->out->elementEnd('span', 'addressees'); - } - - function showGroupAddressees($first) - { - $groups = $this->getGroups(); - - foreach ($groups as $group) { - if (!$first) { - $this->out->text( _m('SEPARATOR',', ')); - } else { - $this->out->text(_(' ▸ ')); - $first = false; + $pa = $this->getProfileAddressees(); + + if (!empty($pa)) { + $this->out->elementStart('span', 'addressees'); + $first = true; + foreach ($pa as $addr) { + if (!$first) { + // TRANS: Separator in profile addressees list. + $this->out->text(_m('SEPARATOR',', ')); + } else { + // Start of profile addressees list. + $first = false; + } + $text = $addr['text']; + unset($addr['text']); + $this->out->element('a', $addr, $text); } - $this->out->element('a', array('href' => $group->homeUrl(), - 'title' => $group->nickname, - 'class' => 'addressee group'), - $group->getBestName()); + $this->out->elementEnd('span', 'addressees'); } - - return count($groups); } - function getGroups() + function getProfileAddressees() { - return $this->notice->getGroups(); - } + $pa = array(); - function showProfileAddressees($first) - { - $replies = $this->getReplyProfiles(); + $attentions = $this->getReplyProfiles(); - foreach ($replies as $reply) { - if (!$first) { - // TRANS: Separator in profile addressees list. - $this->out->text(_m('SEPARATOR',', ')); - } else { - // TRANS: Start of profile addressees list. - $this->out->text(_(' ▸ ')); - $first = false; - } - $this->out->element('a', array('href' => $reply->profileurl, - 'title' => $reply->nickname, - 'class' => 'addressee account'), - $reply->getBestName()); + foreach ($attentions as $attn) { + $class = $attn->isGroup() ? 'group' : 'account'; + $pa[] = array('href' => $attn->profileurl, + 'title' => $attn->nickname, + 'class' => "addressee {$class}", + 'text' => $attn->getStreamName()); } - return count($replies); + return $pa; } function getReplyProfiles() @@ -301,11 +287,9 @@ class NoticeListItem extends Widget { $avatar_size = $this->avatarSize(); - $avatar = $this->profile->getAvatar($avatar_size); + $avatarUrl = $this->profile->avatarUrl($avatar_size); - $this->out->element('img', array('src' => ($avatar) ? - $avatar->displayUrl() : - Avatar::defaultImage($avatar_size), + $this->out->element('img', array('src' => $avatarUrl, 'class' => 'avatar photo', 'width' => $avatar_size, 'height' => $avatar_size, @@ -368,25 +352,19 @@ class NoticeListItem extends Widget /** * show the link to the main page for the notice * - * Displays a link to the page for a notice, with "relative" time. Tries to - * get remote notice URLs correct, but doesn't always succeed. + * Displays a local link to the rendered notice, with "relative" time. * * @return void */ function showNoticeLink() { - $noticeurl = $this->notice->bestUrl(); - - // above should always return an URL - - assert(!empty($noticeurl)); - $this->out->elementStart('a', array('rel' => 'bookmark', 'class' => 'timestamp', - 'href' => $noticeurl)); - $dt = common_date_iso8601($this->notice->created); - $this->out->element('abbr', array('class' => 'published', - 'title' => $dt), + 'href' => $this->notice->getLocalUrl())); + $this->out->element('time', array('class' => 'dt-published', + 'datetime' => common_date_iso8601($this->notice->created), + // TRANS: Timestamp title (tooltip text) for NoticeListItem + 'title' => common_exact_date($this->notice->created)), common_date_string($this->notice->created)); $this->out->elementEnd('a'); } @@ -544,32 +522,11 @@ class NoticeListItem extends Widget */ function showContext() { - if ($this->notice->hasConversation()) { - $conv = Conversation::staticGet( - 'id', - $this->notice->conversation - ); - $convurl = $conv->uri; - if (!empty($convurl)) { - $this->out->text(' '); - $this->out->element( - 'a', - array( - 'href' => $convurl.'#notice-'.$this->notice->id, - 'class' => 'response'), - // TRANS: Addition in notice list item if notice is part of a conversation. - _('in context') - ); - } else { - $msg = sprintf( - "Couldn't find Conversation ID %d to make 'in context'" - . "link for Notice ID %d", - $this->notice->conversation, - $this->notice->id - ); - common_log(LOG_WARNING, $msg); - } - } + $this->out->element('a', + array('href' => $this->notice->getConversationUrl(), + 'class' => 'conversation'), + // TRANS: Addition in notice list item if notice is part of a conversation. + _('in context')); } /** @@ -581,7 +538,7 @@ class NoticeListItem extends Widget { if (!empty($this->repeat)) { - $repeater = Profile::staticGet('id', $this->repeat->profile_id); + $repeater = Profile::getKV('id', $this->repeat->profile_id); $attrs = array('href' => $repeater->profileurl, 'class' => 'url'); @@ -594,6 +551,7 @@ class NoticeListItem extends Widget // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname. $this->out->raw(_('Repeated by')); + $this->out->raw(' '); $this->out->elementStart('a', $attrs); $this->out->element('span', 'fn nickname', $repeater->nickname); @@ -620,7 +578,7 @@ class NoticeListItem extends Widget $this->out->elementStart('a', array('href' => $reply_url, 'class' => 'notice_reply', // TRANS: Link title in notice list item to reply to a notice. - 'title' => _('Reply to this notice'))); + 'title' => _('Reply to this notice.'))); // TRANS: Link text in notice list item to reply to a notice. $this->out->text(_('Reply')); $this->out->text(' '); @@ -648,7 +606,7 @@ class NoticeListItem extends Widget $this->out->element('a', array('href' => $deleteurl, 'class' => 'notice_delete', // TRANS: Link title in notice list item to delete a notice. - 'title' => _('Delete this notice')), + 'title' => _('Delete this notice from the timeline.')), // TRANS: Link text in notice list item to delete a notice. _('Delete')); } @@ -668,7 +626,7 @@ class NoticeListItem extends Widget $user->id != $this->notice->profile_id) { $this->out->text(' '); $profile = $user->getProfile(); - if ($profile->hasRepeated($this->notice->id)) { + if ($profile->hasRepeated($this->notice)) { $this->out->element('span', array('class' => 'repeated', // TRANS: Title for repeat form status in notice list when a notice has been repeated. 'title' => _('Notice repeated.')), @@ -696,4 +654,17 @@ class NoticeListItem extends Widget Event::handle('EndCloseNoticeListItemElement', array($this)); } } + + /** + * Get the notice in question + * + * For hooks, etc., this may be useful + * + * @return Notice The notice we're showing + */ + + function getNotice() + { + return $this->notice; + } }