Merge remote branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/actions/tagother.php b/actions/tagother.php
index 5daf612fb530f7a5881532a22b40940ce0956b20..c3bf219f67b2e597ec66efb6577225a98624c190 100644 (file)
--- 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;
         }
 
@@ -73,10 +74,12 @@ class TagotherAction extends Action
 
     function showContent()
     {
-        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $this->elementStart('div', 'entity_profile vcard author');
+        $this->element('h2', null, _('User profile'));
 
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
-                                    'class' => 'avatar stream',
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
+                                    'class' => 'photo avatar entity_depiction',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' =>
@@ -84,37 +87,52 @@ class TagotherAction extends Action
                                     $this->profile->nickname));
 
         $this->element('a', array('href' => $this->profile->profileurl,
-                                  'class' => 'external profile nickname'),
+                                  'class' => 'entity_nickname nickname'),
                        $this->profile->nickname);
 
         if ($this->profile->fullname) {
-            $this->elementStart('div', 'fullname');
-            if ($this->profile->homepage) {
-                $this->element('a', array('href' => $this->profile->homepage),
-                               $this->profile->fullname);
-            } else {
-                $this->text($this->profile->fullname);
-            }
-            $this->elementEnd('div');
+            $this->element('div', 'fn entity_fn', $this->profile->fullname);
         }
+
         if ($this->profile->location) {
-            $this->element('div', 'location', $this->profile->location);
+            $this->element('div', 'label entity_location', $this->profile->location);
+        }
+
+        if ($this->profile->homepage) {
+            $this->element('a', array('href' => $this->profile->homepage,
+                                      'rel' => 'me',
+                                      'class' => 'url entity_url'),
+                           $this->profile->homepage);
         }
+
         if ($this->profile->bio) {
-            $this->element('div', 'bio', $this->profile->bio);
+            $this->element('div', 'note entity_note', $this->profile->bio);
         }
 
+        $this->elementEnd('div');
+
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'tag_user',
+                                           'id' => 'form_tag_user',
+                                           'class' => 'form_settings',
                                            'name' => 'tagother',
-                                           'action' => $this->selfUrl()));
+                                           'action' => common_local_url('tagother', array('id' => $this->profile->id))));
+
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Tag user'));
         $this->hidden('token', common_session_token());
         $this->hidden('id', $this->profile->id);
+
+        $user = common_current_user();
+
+        $this->elementStart('ul', 'form_data');
+        $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'));
-
-        $this->submit('save', _('Save'));
+                     _('Tags for this user (letters, numbers, -, ., and _), separated by commas or spaces.'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->submit('save', _m('BUTTON','Save'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -125,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;
         }
 
@@ -137,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;
                 }
             }
@@ -166,7 +186,7 @@ class TagotherAction extends Action
         $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers';
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Tags'));
             $this->elementEnd('head');
@@ -183,7 +203,8 @@ class TagotherAction extends Action
             $this->elementEnd('html');
         } else {
             common_redirect(common_local_url($action, array('nickname' =>
-                                                            $user->nickname)));
+                                                            $user->nickname)),
+                            303);
         }
     }
 
@@ -199,4 +220,3 @@ class TagotherAction extends Action
         }
     }
 }
-