X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fuserbyid.php;h=09fb4258d9c4a3c4fd0a27813c47707d77e6042e;hb=6d739789f6b94e7f0311c15334eb1daf550e4776;hp=4a985fcd7220c842f6b99efc9dcc597f21e959bd;hpb=5ff8d8d447f306f4ad654d56b47cc6f740321c38;p=quix0rs-gnu-social.git

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 4a985fcd72..09fb4258d9 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,19 +1,18 @@
 <?php
-
 /**
  * User by ID action class.
  *
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @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://laconi.ca/
+ * @link     http://status.net/
 
- * 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
@@ -29,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -37,45 +36,50 @@ if (!defined('LACONICA')) {
  * User by ID action class.
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @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://laconi.ca/
+ * @link     http://status.net/
  */
 class UserbyidAction extends Action
 {
      /**
      * Is read only?
-     * 
+     *
      * @return boolean true
      */
     function isReadOnly($args)
-    {                
+    {
         return true;
     }
 
      /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $id = $this->trimmed('id');
         if (!$id) {
-            $this->clientError(_('No id.'));
+            // TRANS: Client error displayed trying to find a user by ID without providing an ID.
+            $this->clientError(_('No ID.'));
         }
-        $user =& User::staticGet($id);
+        $user = User::getKV($id);
         if (!$user) {
+            // TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
             $this->clientError(_('No such user.'));
         }
 
-        // 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';
+        // 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),
@@ -85,4 +89,3 @@ class UserbyidAction extends Action
         common_redirect($url, 303);
     }
 }
-