X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=6ecdf2e50ab337bdcabd7364dbca35a09a2558d4;hb=c00491cd7a29a9ef16d6e6bfa54505d4c9a522fe;hp=727c76d528a3531543b752fe07704c18dac04b4f;hpb=59a0b2a82da418f688faf182407146d9e7a7af7a;p=quix0rs-gnu-social.git diff --git a/actions/public.php b/actions/public.php index 727c76d528..6ecdf2e50a 100644 --- a/actions/public.php +++ b/actions/public.php @@ -51,7 +51,6 @@ define('MAX_PUBLIC_PAGE', 100); * @see PublicrssAction * @see PublicxrdsAction */ - class PublicAction extends Action { /** @@ -60,6 +59,7 @@ class PublicAction extends Action var $page = null; var $notice; + var $userProfile = null; function isReadOnly($args) { @@ -73,28 +73,39 @@ class PublicAction extends Action * * @return boolean success value */ - function prepare($args) { parent::prepare($args); $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; if ($this->page > MAX_PUBLIC_PAGE) { - $this->clientError(sprintf(_("Beyond the page limit (%s)."), MAX_PUBLIC_PAGE)); + // TRANS: Client error displayed when requesting a public timeline page beyond the page limit. + // TRANS: %s is the page limit. + $this->clientError(sprintf(_('Beyond the page limit (%s).'), MAX_PUBLIC_PAGE)); } common_set_returnto($this->selfUrl()); - $this->notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1); + $this->userProfile = Profile::current(); + + $user = common_current_user(); + + if (!empty($user) && $user->streamModeOnly()) { + $stream = new PublicNoticeStream($this->userProfile); + } else { + $stream = new ThreadingPublicNoticeStream($this->userProfile); + } + + $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); if (!$this->notice) { - $this->serverError(_('Could not retrieve public stream.')); - return; + // TRANS: Server error displayed when a public timeline cannot be retrieved. + $this->serverError(_('Could not retrieve public timeline.')); } if($this->page > 1 && $this->notice->N == 0){ - // TRANS: Server error when page not found (404) + // TRANS: Server error when page not found (404). $this->serverError(_('No such page.'),$code=404); } @@ -110,7 +121,6 @@ class PublicAction extends Action * * @return void */ - function handle($args) { parent::handle($args); @@ -123,12 +133,14 @@ class PublicAction extends Action * * @return page title, including page number if over 1 */ - function title() { if ($this->page > 1) { + // TRANS: Title for all public timeline pages but the first. + // TRANS: %d is the page number. return sprintf(_('Public timeline, page %d'), $this->page); } else { + // TRANS: Title for the first public timeline page. return _('Public timeline'); } } @@ -146,6 +158,11 @@ class PublicAction extends Action $this->element('link', array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'href' => $rsd)); + + if ($this->page != 1) { + $this->element('link', array('rel' => 'canonical', + 'href' => common_local_url('public'))); + } } /** @@ -153,48 +170,43 @@ class PublicAction extends Action * * @return void */ - function getFeeds() { - return array(new Feed(Feed::RSS1, common_local_url('publicrss'), - _('Public Stream Feed (RSS 1.0)')), + return array(new Feed(Feed::JSON, + common_local_url('ApiTimelinePublic', + array('format' => 'as')), + // TRANS: Link description for public timeline feed. + _('Public Timeline Feed (Activity Streams JSON)')), + new Feed(Feed::RSS1, common_local_url('publicrss'), + // TRANS: Link description for public timeline feed. + _('Public Timeline Feed (RSS 1.0)')), new Feed(Feed::RSS2, common_local_url('ApiTimelinePublic', array('format' => 'rss')), - _('Public Stream Feed (RSS 2.0)')), + // TRANS: Link description for public timeline feed. + _('Public Timeline Feed (RSS 2.0)')), new Feed(Feed::ATOM, common_local_url('ApiTimelinePublic', array('format' => 'atom')), - _('Public Stream Feed (Atom)'))); - } - - /** - * Show tabset for this page - * - * Uses the PublicGroupNav widget - * - * @return void - * @see PublicGroupNav - */ - - function showLocalNav() - { - $nav = new PublicGroupNav($this); - $nav->show(); + // TRANS: Link description for public timeline feed. + _('Public Timeline Feed (Atom)'))); } function showEmptyList() { + // TRANS: Text displayed for public feed when there are no public notices. $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' '; if (common_logged_in()) { + // TRANS: Additional text displayed for public feed when there are no public notices for a logged in user. $message .= _('Be the first to post!'); } else { if (! (common_config('site','closed') || common_config('site','inviteonly'))) { + // TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user. $message .= _('Why not [register an account](%%action.register%%) and be the first to post!'); } - } + } $this->elementStart('div', 'guide'); $this->raw(common_markup_to_html($message)); @@ -209,10 +221,15 @@ class PublicAction extends Action * * @return void */ - function showContent() { - $nl = new ThreadedNoticeList($this->notice, $this); + $user = common_current_user(); + + if (!empty($user) && $user->streamModeOnly()) { + $nl = new NoticeList($this->notice, $this); + } else { + $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile); + } $cnt = $nl->show(); @@ -226,12 +243,30 @@ class PublicAction extends Action function showSections() { - // $top = new TopPostersSection($this); - // $top->show(); - $pop = new PopularNoticeSection($this); + // Show invite button, as long as site isn't closed, and + // we have a logged in user. + if (common_config('invite', 'enabled') && !common_config('site', 'closed') && common_logged_in()) { + if (!common_config('site', 'private')) { + $ibs = new InviteButtonSection( + $this, + // TRANS: Button text for inviting more users to the StatusNet instance. + // TRANS: Less business/enterprise-oriented language for public sites. + _m('BUTTON', 'Send invite') + ); + } else { + $ibs = new InviteButtonSection($this); + } + $ibs->show(); + } + + $p = Profile::current(); + + $pop = new PopularNoticeSection($this, $p); $pop->show(); - $gbp = new GroupsByMembersSection($this); - $gbp->show(); + if (!common_config('performance', 'high')) { + $cloud = new PublicTagCloudSection($this); + $cloud->show(); + } $feat = new FeaturedUsersSection($this); $feat->show(); } @@ -239,11 +274,15 @@ class PublicAction extends Action function showAnonymousMessage() { if (! (common_config('site','closed') || common_config('site','inviteonly'))) { + // TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices. + // TRANS: This message contains Markdown links. Please mind the formatting. $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. ' . '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ' . '([Read more](%%doc.help%%))'); } else { + // TRANS: Message for not logged in users at a closed site trying to view the public feed of notices. + // TRANS: This message contains Markdown links. Please mind the formatting. $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool.'); } @@ -252,3 +291,11 @@ class PublicAction extends Action $this->elementEnd('div'); } } + +class ThreadingPublicNoticeStream extends ThreadingNoticeStream +{ + function __construct($profile) + { + parent::__construct(new PublicNoticeStream($profile)); + } +}