X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftagother.php;h=c3bf219f67b2e597ec66efb6577225a98624c190;hb=865c1bc27838a1b7ee41ff513d30d2c8c6f4cd10;hp=0d18945a09e88b2e8d2cc9b2704584cc93184be1;hpb=5ec5a22dc75cb8f4d896b41ca24067c68d3e1de6;p=quix0rs-gnu-social.git

diff --git a/actions/tagother.php b/actions/tagother.php
index 0d18945a09..c3bf219f67 100644
--- a/actions/tagother.php
+++ b/actions/tagother.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,10 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
+// @todo FIXME: documentation missing.
 class TagotherAction extends Action
 {
     var $profile = null;
@@ -30,13 +31,13 @@ class TagotherAction extends Action
     {
         parent::prepare($args);
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in'), 403);
+            $this->clientError(_('Not logged in.'), 403);
             return false;
         }
 
         $id = $this->trimmed('id');
         if (!$id) {
-            $this->clientError(_('No id argument.'));
+            $this->clientError(_('No ID argument.'));
             return false;
         }
 
@@ -77,58 +78,37 @@ class TagotherAction extends Action
         $this->element('h2', null, _('User profile'));
 
         $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $this->elementStart('dl', 'entity_depiction');
-        $this->element('dt', null, _('Photo'));
-        $this->elementStart('dd');
         $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
-                                    'class' => 'photo avatar',
+                                    'class' => 'photo avatar entity_depiction',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
         $this->element('a', array('href' => $this->profile->profileurl,
-                                  'class' => 'nickname'),
+                                  'class' => 'entity_nickname nickname'),
                        $this->profile->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($this->profile->fullname) {
-            $this->elementStart('dl', 'entity_fn');
-            $this->element('dt', null, _('Full name'));
-            $this->elementStart('dd');
-            $this->element('span', 'fn', $this->profile->fullname);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->element('div', 'fn entity_fn', $this->profile->fullname);
         }
+
         if ($this->profile->location) {
-            $this->elementStart('dl', 'entity_location');
-            $this->element('dt', null, _('Location'));
-            $this->element('dd', 'label', $this->profile->location);
-            $this->elementEnd('dl');
+            $this->element('div', 'label entity_location', $this->profile->location);
         }
+
         if ($this->profile->homepage) {
-            $this->elementStart('dl', 'entity_url');
-            $this->element('dt', null, _('URL'));
-            $this->elementStart('dd');
             $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
+                                      'rel' => 'me',
+                                      'class' => 'url entity_url'),
                            $this->profile->homepage);
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
         }
+
         if ($this->profile->bio) {
-            $this->elementStart('dl', 'entity_note');
-            $this->element('dt', null, _('Note'));
-            $this->element('dd', 'note', $this->profile->bio);
-            $this->elementEnd('dl');
+            $this->element('div', 'note entity_note', $this->profile->bio);
         }
+
         $this->elementEnd('div');
 
         $this->elementStart('form', array('method' => 'post',
@@ -148,10 +128,10 @@ class TagotherAction extends Action
         $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', Profile_tag::getTags($user->id, $this->profile->id)),
-                     _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated'));
+                     _('Tags for this user (letters, numbers, -, ., and _), separated by commas or spaces.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('save', _('Save'));
+        $this->submit('save', _m('BUTTON','Save'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -163,8 +143,8 @@ class TagotherAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token.'.
-                              ' Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
@@ -175,7 +155,9 @@ class TagotherAction extends Action
 
             foreach ($tags as $tag) {
                 if (!common_valid_profile_tag($tag)) {
-                    $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
+                    // TRANS: Form validation error when entering an invalid tag.
+                    // TRANS: %s is the invalid tag.
+                    $this->showForm(sprintf(_('Invalid tag: "%s".'), $tag));
                     return;
                 }
             }
@@ -221,7 +203,8 @@ class TagotherAction extends Action
             $this->elementEnd('html');
         } else {
             common_redirect(common_local_url($action, array('nickname' =>
-                                                            $user->nickname)));
+                                                            $user->nickname)),
+                            303);
         }
     }
 
@@ -237,4 +220,3 @@ class TagotherAction extends Action
         }
     }
 }
-