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, 53 insertions, 21 deletions

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 4907749ce..65c67c64e 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -1,5 +1,16 @@
 <?php
-/*
+/**
+ * Access token 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,26 +28,47 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/omb.php');
+require_once INSTALLDIR.'/lib/omb.php';
 
-class AccesstokenAction extends Action {
-	function handle($args) {
-		parent::handle($args);
-		try {
-			common_debug('getting request from env variables', __FILE__);
-			common_remove_magic_from_request();
-			$req = OAuthRequest::from_request();
-			common_debug('getting a server', __FILE__);
-			$server = omb_oauth_server();
-			common_debug('fetching the access token', __FILE__);
-			$token = $server->fetch_access_token($req);
-			common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__);
-			common_debug('printing the access token', __FILE__);
-			print $token;
-		} catch (OAuthException $e) {
-			common_server_error($e->getMessage());
-		}
-	}
+/**
+ * Access token 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 AccesstokenAction extends Action
+{
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     * 
+     * @return boolean false if user doesn't exist
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        try {
+            common_debug('getting request from env variables', __FILE__);
+            common_remove_magic_from_request();
+            $req = OAuthRequest::from_request();
+            common_debug('getting a server', __FILE__);
+            $server = omb_oauth_server();
+            common_debug('fetching the access token', __FILE__);
+            $token = $server->fetch_access_token($req);
+            common_debug('got this token: "'.print_r($token, true).'"', __FILE__);
+            common_debug('printing the access token', __FILE__);
+            print $token;
+        } catch (OAuthException $e) {
+            $this->serverError($e->getMessage());
+        }
+    }
 }