X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftagother.php;h=735d876da29bb70dfefb0c2acec50ef13d092740;hb=663e4e02a1b3b1c104c2c3db19e524a486c3d981;hp=e11e3a00df40c3c4f723465ecc0e98b76b0b93aa;hpb=1a02d681fa1de7c2daed2ecc951f4c9bf1c13976;p=quix0rs-gnu-social.git

diff --git a/actions/tagother.php b/actions/tagother.php
index e11e3a00df..735d876da2 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,111 +17,154 @@
  * 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');
 
 class TagotherAction extends Action
 {
+    var $profile = null;
+    var $error = null;
 
-    function handle($args)
+    function prepare($args)
     {
+        parent::prepare($args);
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'), 403);
+            return false;
+        }
 
-        parent::handle($args);
+        $id = $this->trimmed('id');
+        if (!$id) {
+            $this->clientError(_('No ID argument.'));
+            return false;
+        }
 
-        if (!common_logged_in()) {
-            $this->clientError(_('Not logged in'), 403);
-            return;
+        $this->profile = Profile::staticGet('id', $id);
+
+        if (!$this->profile) {
+            $this->clientError(_('No profile with that ID.'));
+            return false;
         }
 
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->save_tags();
+            $this->saveTags();
         } else {
-            $id = $this->trimmed('id');
-            if (!$id) {
-                $this->clientError(_('No id argument.'));
-                return;
-            }
-            $profile = Profile::staticGet('id', $id);
-            if (!$profile) {
-                $this->clientError(_('No profile with that ID.'));
-                return;
-            }
-            $this->show_form($profile);
+            $this->showForm($profile);
         }
     }
 
-    function show_form($profile, $error=null)
+    function title()
     {
+        return sprintf(_('Tag %s'), $this->profile->nickname);
+    }
 
-        $user = common_current_user();
-
-        common_show_header(_('Tag a person'),
-                           null, array($profile, $error), array($this, 'show_top'));
-
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+    function showForm($error=null)
+    {
+        $this->error = $error;
+        $this->showPage();
+    }
 
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
-                                    'class' => 'avatar stream',
+    function showContent()
+    {
+        $this->elementStart('div', 'entity_profile vcard author');
+        $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',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' =>
-                                    ($profile->fullname) ? $profile->fullname :
-                                    $profile->nickname));
-
-        $this->element('a', array('href' => $profile->profileurl,
-                                  'class' => 'external profile nickname'),
-                       $profile->nickname);
-
-        if ($profile->fullname) {
-            $this->elementStart('div', 'fullname');
-            if ($profile->homepage) {
-                $this->element('a', array('href' => $profile->homepage),
-                               $profile->fullname);
-            } else {
-                $this->text($profile->fullname);
-            }
-            $this->elementEnd('div');
+                                    ($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'),
+                       $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');
+        }
+        if ($this->profile->location) {
+            $this->elementStart('dl', 'entity_location');
+            $this->element('dt', null, _('Location'));
+            $this->element('dd', 'label', $this->profile->location);
+            $this->elementEnd('dl');
         }
-        if ($profile->location) {
-            $this->element('div', 'location', $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'),
+                           $this->profile->homepage);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
-        if ($profile->bio) {
-            $this->element('div', 'bio', $profile->bio);
+        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->elementEnd('div');
 
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'tag_user',
+                                           'id' => 'form_tag_user',
+                                           'class' => 'form_settings',
                                            'name' => 'tagother',
-                                           'action' => $this->self_url()));
+                                           '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', $profile->id);
+        $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, $profile->id)),
+                     ($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->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
-        common_show_footer();
-
     }
 
-    function save_tags()
+    function saveTags()
     {
-
         $id = $this->trimmed('id');
         $tagstring = $this->trimmed('tags');
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
-            return;
-        }
-
-        $profile = Profile::staticGet('id', $id);
-
-        if (!$profile) {
-            $this->clientError(_('No such profile.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
@@ -132,7 +175,7 @@ class TagotherAction extends Action
 
             foreach ($tags as $tag) {
                 if (!common_valid_profile_tag($tag)) {
-                    $this->show_form($profile, sprintf(_('Invalid tag: "%s"'), $tag));
+                    $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
                     return;
                 }
             }
@@ -143,25 +186,25 @@ class TagotherAction extends Action
         $user = common_current_user();
 
         if (!Subscription::pkeyGet(array('subscriber' => $user->id,
-                                         'subscribed' => $profile->id)) &&
-            !Subscription::pkeyGet(array('subscriber' => $profile->id,
+                                         'subscribed' => $this->profile->id)) &&
+            !Subscription::pkeyGet(array('subscriber' => $this->profile->id,
                                          'subscribed' => $user->id)))
         {
             $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
             return;
         }
 
-        $result = Profile_tag::setTags($user->id, $profile->id, $tags);
+        $result = Profile_tag::setTags($user->id, $this->profile->id, $tags);
 
         if (!$result) {
             $this->clientError(_('Could not save tags.'));
             return;
         }
 
-        $action = $user->isSubscribed($profile) ? 'subscriptions' : 'subscribers';
+        $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');
@@ -178,15 +221,15 @@ class TagotherAction extends Action
             $this->elementEnd('html');
         } else {
             common_redirect(common_local_url($action, array('nickname' =>
-                                                            $user->nickname)));
+                                                            $user->nickname)),
+                            303);
         }
     }
 
-    function show_top($arr = null)
+    function showPageNotice()
     {
-        list($profile, $error) = $arr;
-        if ($error) {
-            $this->element('p', 'error', $error);
+        if ($this->error) {
+            $this->element('p', 'error', $this->error);
         } else {
             $this->elementStart('div', 'instructions');
             $this->element('p', null,