Merge branch 'group-join-approve-reject-button-icons' into 'nightly'

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

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 4bb896c38e11cd7d67635da6b6e90208cf7feeca..1e3c9d8519bf13be3618881547508f3bbb4ffbe5 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,7 +1,18 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * User by ID action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+
+ * 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,36 +28,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-class UserbyidAction extends Action
+/**
+ * User by ID action class.
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class UserbyidAction extends ShowstreamAction
 {
-    
-    function isReadOnly()
-    {                
-        return true;
-    }
-    
-    function handle($args)
+    protected function doPreparation()
     {
-        parent::handle($args);
-        $id = $this->trimmed('id');
-        if (!$id) {
-            $this->clientError(_('No id.'));
-        }
-        $user =& User::staticGet($id);
-        if (!$user) {
-            $this->clientError(_('No such user.'));
-        }
+        // accessing by ID just requires an ID, not a nickname
+        $this->target = Profile::getByID($this->trimmed('id'));
 
-        // support redirecting to FOAF rdf/xml if the agent prefers it
-        $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
-        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
-        $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
-                                      common_accept_to_prefs($page_prefs));
-        $page = $type == 'application/rdf+xml' ? 'foaf' : 'showstream';
-
-        $url = common_local_url($page, array('nickname' => $user->nickname));
-        common_redirect($url, 303);
+        // For local users when accessed by id number, redirect with
+        // the nickname as argument instead of id.
+        if ($this->target->isLocal()) {
+            // Support redirecting to FOAF rdf/xml if the agent prefers it...
+            // Internet Explorer doesn't specify "text/html" and does list "*/*"
+            // at least through version 8. We need to list text/html up front to
+            // ensure that only user-agents who specifically ask for RDF get it.
+            $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
+            $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+            $type       = common_negotiate_type(common_accept_to_prefs($httpaccept),
+                                                common_accept_to_prefs($page_prefs));
+            $page       = $type === 'application/rdf+xml' ? 'foaf' : 'showstream';
+            $url        = common_local_url($page, array('nickname' => $this->target->getNickname()));
+            common_redirect($url, 303);
+        }
     }
 }