X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgalleryaction.php;h=bd7da195fa0b66f7d72840e28d70ef3741f1b594;hb=22e50ad7bbdef7d77172a1e892a6952ca9f26d77;hp=a277762a6594b12af6b09235b8dbea2b8f6efa23;hpb=9d913150d4c3b967207837eb07afe890638944ac;p=quix0rs-gnu-social.git

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index a277762a65..bd7da195fa 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -27,11 +27,12 @@ require_once INSTALLDIR.'/lib/profilelist.php';
 
 define('AVATARS_PER_PAGE', 80);
 
-class GalleryAction extends Action
+// @todo FIXME: Class documentation missing.
+class GalleryAction extends ProfileAction
 {
     var $profile = null;
-    var $user = null;
     var $page = null;
+    var $tag = null;
 
     function prepare($args)
     {
@@ -49,13 +50,14 @@ class GalleryAction extends Action
             if ($this->arg('page') && $this->arg('page') != 1) {
                 $args['page'] = $this->arg['page'];
             }
-            common_redirect(common_local_url('subscriptions', $args), 301);
+            common_redirect(common_local_url($this->trimmed('action'), $args), 301);
             return false;
         }
 
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -63,16 +65,20 @@ class GalleryAction extends Action
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        $this->tag = $this->trimmed('tag');
+        $this->q   = $this->trimmed('q');
+
         return true;
     }
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -81,22 +87,16 @@ class GalleryAction extends Action
     {
         parent::handle($args);
 
-		# Post from the tag dropdown; redirect to a GET
+		// Post from the tag dropdown; redirect to a GET
 
 		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-		    common_redirect($this->self_url(), 307);
+		    common_redirect($this->selfUrl(), 303);
             return;
 		}
 
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->showTagsDropdown();
@@ -114,8 +114,8 @@ class GalleryAction extends Action
             $content[$t] = $t;
         }
         if ($tags) {
-            $this->elementStart('dl', array('id'=>'filter_tags'));
-            $this->element('dt', null, _('Filter tags'));
+            $this->elementStart('dl', array('id' => 'filter_tags'));
+            $this->element('dt', null, _('Tags'));
             $this->elementStart('dd');
             $this->elementStart('ul');
             $this->elementStart('li', array('id' => 'filter_tags_all',
@@ -124,16 +124,26 @@ class GalleryAction extends Action
                            array('href' =>
                                  common_local_url($this->trimmed('action'),
                                                   array('nickname' =>
-                                                        $profile->nickname))),
-                           _('All'));
+                                                        $this->user->nickname))),
+                           // TRANS: List element on gallery action page to show all tags.
+                           _m('TAGS','All'));
             $this->elementEnd('li');
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
-                                               'id' => 'bytag',
+                                               'id' => 'form_filter_bytag',
+                                              'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
+            $this->elementStart('fieldset');
+            // TRANS: Fieldset legend on gallery action page.
+            $this->element('legend', null, _('Select tag to filter'));
+            // TRANS: Dropdown field label on gallery action page for a list containing tags.
             $this->dropdown('tag', _('Tag'), $content,
-                            _('Choose a tag to narrow list'), false, $tag);
-            $this->submit('go', _('Go'));
+                            // TRANS: Dropdown field title on gallery action page for a list containing tags.
+                            _('Choose a tag to narrow list.'), false, $tag);
+            $this->hidden('nickname', $this->user->nickname);
+            // TRANS: Submit button text on gallery action page.
+            $this->submit('submit', _m('BUTTON','Go'));
+            $this->elementEnd('fieldset');
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
@@ -143,7 +153,6 @@ class GalleryAction extends Action
     }
 
     // Get list of tags we tagged other users with
-
     function getTags($lst, $usr)
     {
         $profile_tag = new Notice_tag();
@@ -165,4 +174,10 @@ class GalleryAction extends Action
     {
         return array();
     }
-}
\ No newline at end of file
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
+}