Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 27b6b7bb5b684084b693dd750ec1fa198eb02aad..1e3c9d8519bf13be3618881547508f3bbb4ffbe5 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -28,9 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * User by ID action class.
@@ -42,50 +40,27 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class UserbyidAction extends Action
+class UserbyidAction extends ShowstreamAction
 {
-     /**
-     * Is read only?
-     *
-     * @return boolean true
-     */
-    function isReadOnly(array $args=array())
+    protected function doPreparation()
     {
-        return true;
-    }
+        // accessing by ID just requires an ID, not a nickname
+        $this->target = Profile::getByID($this->trimmed('id'));
 
-     /**
-     * Class handler.
-     *
-     * @param array $args array of arguments
-     *
-     * @return nothing
-     */
-    protected function handle()
-    {
-        parent::handle();
-        $id = $this->trimmed('id');
-        if (!$id) {
-            // TRANS: Client error displayed trying to find a user by ID without providing an ID.
-            $this->clientError(_('No ID.'));
+        // 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);
         }
-        $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...
-        // 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' => $user->nickname));
-        common_redirect($url, 303);
     }
 }