X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftag.php;h=21cae9aba5127e43a83209fc52da13432f384d7b;hb=418b3c3c53194040022c4b56bd0c0b04fd6fd4d7;hp=7c6f99d92bac58cb6ef98d8641c425f2169b5653;hpb=f85fc944b7ca3d2faaa7b7451068e37f2c5b68a7;p=quix0rs-gnu-social.git

diff --git a/actions/tag.php b/actions/tag.php
index 7c6f99d92b..21cae9aba5 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -19,10 +19,12 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo FIXME: documentation missing.
 class TagAction extends Action
 {
-
     var $notice;
+    var $tag;
+    var $page;
 
     function prepare($args)
     {
@@ -32,13 +34,10 @@ class TagAction extends Action
 
         if (!$this->tag) {
             common_redirect(common_local_url('publictagcloud'), 301);
-            return false;
         }
 
         if ($this->tag != $taginput) {
-            common_redirect(common_local_url('tag', array('tag' => $this->tag)),
-                            301);
-            return false;
+            common_redirect(common_local_url('tag', array('tag' => $this->tag)), 301);
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -48,24 +47,22 @@ class TagAction extends Action
         $this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
         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);
         }
 
         return true;
     }
 
-    function showSections()
-    {
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-    }
-
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Title for first page of notices with tags.
+            // TRANS: %s is the tag.
             return sprintf(_('Notices tagged with %s'), $this->tag);
         } else {
+            // TRANS: Title for all but the first page of notices with tags.
+            // TRANS: %1$s is the tag, %2$d is the page number.
             return sprintf(_('Notices tagged with %1$s, page %2$d'),
                            $this->tag,
                            $this->page);
@@ -81,21 +78,35 @@ class TagAction extends Action
 
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineTag',
+                                               array('format' => 'as',
+                                                     'tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
+                              sprintf(_('Notice feed for tag %s (Activity Streams JSON)'),
+                                      $this->tag)),
+                     new Feed(Feed::RSS1,
                               common_local_url('tagrss',
                                                array('tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
                               sprintf(_('Notice feed for tag %s (RSS 1.0)'),
                                       $this->tag)),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelineTag',
                                                array('format' => 'rss',
                                                      'tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
                               sprintf(_('Notice feed for tag %s (RSS 2.0)'),
                                       $this->tag)),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelineTag',
                                                array('format' => 'atom',
                                                      'tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
                               sprintf(_('Notice feed for tag %s (Atom)'),
                                       $this->tag)));
     }
@@ -103,7 +114,7 @@ class TagAction extends Action
     function showContent()
     {
         if(Event::handle('StartTagShowContent', array($this))) {
-            
+
             $nl = new NoticeList($this->notice, $this);
 
             $cnt = $nl->show();