Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 61 insertions, 22 deletions

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 38bff2ede..1e30d1aac 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,5 +1,17 @@
 <?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>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,33 +29,60 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-class UserbyidAction extends Action {
-	
-	function is_readonly() {				
-		return true;
-	}
-	
-    function handle($args) {
+/**
+ * User by ID action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+class UserbyidAction extends Action
+{
+     /**
+     * Is read only?
+     * 
+     * @return boolean true
+     */
+    function isReadOnly()
+    {                
+        return true;
+    }
+
+     /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
+    function handle($args)
+    {
         parent::handle($args);
         $id = $this->trimmed('id');
         if (!$id) {
-        	$this->client_error(_('No id.'));
-		}
-		$user =& User::staticGet($id);
-		if (!$user) {
-			$this->client_error(_('No such user.'));
+            $this->clientError(_('No id.'));
+        }
+        $user =& User::staticGet($id);
+        if (!$user) {
+            $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';
-        $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);
-	}
+        $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);
+    }
 }
+