Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index 90e0e6e2594c5e0a8b149bc7fa6275559b1d6b30..e4f98dacc35a41c782665853ccce1be1cc50c8bf 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -162,7 +162,12 @@ class PublicAction extends Action
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'as')),
+                              // TRANS: Link description for public timeline feed.
+                              _('Public Stream Feed (Activity Streams JSON)')),
+                    new Feed(Feed::RSS1, common_local_url('publicrss'),
                               // TRANS: Link description for public timeline feed.
                               _('Public Stream Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
@@ -222,8 +227,22 @@ class PublicAction extends Action
 
     function showSections()
     {
-        $ibs = new InviteButtonSection($this);
-        $ibs->show();
+        // Show invite button, as long as site isn't closed, and
+        // we have a logged in user.
+        if (!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();
+        }
+
         $pop = new PopularNoticeSection($this);
         $pop->show();
         $cloud = new PublicTagCloudSection($this);