Merge branch 'master' into FeedPoller

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

diff --git a/actions/showapplication.php b/actions/showapplication.php
index c9cdbf184870074f5fede8f4e80a37ea820c50e9..acee1862f4cc88730a8f6b014eedd4da4d6fb32a 100644 (file)
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -22,7 +22,7 @@
  * @category  Application
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -40,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowApplicationAction extends OwnerDesignAction
+class ShowApplicationAction extends Action
 {
     /**
      * Application to show
@@ -71,8 +71,8 @@ class ShowApplicationAction extends OwnerDesignAction
 
         $id = (int)$this->arg('id');
 
-        $this->application  = Oauth_application::staticGet($id);
-        $this->owner        = User::staticGet($this->application->owner);
+        $this->application  = Oauth_application::getKV($id);
+        $this->owner        = User::getKV($this->application->owner);
 
         if (!common_logged_in()) {
             // TRANS: Client error displayed trying to display an OAuth application while not logged in.
@@ -174,7 +174,7 @@ class ShowApplicationAction extends OwnerDesignAction
         $this->elementStart('div', 'entity_statistics');
         $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess)
             ? 'read-write' : 'read-only';
-        $profile = Profile::staticGet($this->application->owner);
+        $profile = Profile::getKV($this->application->owner);
 
         $appUsers = new Oauth_application_user();
         $appUsers->application_id = $this->application->id;
@@ -251,21 +251,24 @@ class ShowApplicationAction extends OwnerDesignAction
         $this->elementStart('div', 'entity_data');
         // TRANS: Header on the OAuth application page.
         $this->element('h2', null, _('Application info'));
-        $this->element('div',
-                       'entity_consumer_key',
-                       $consumer->consumer_key);
-
-        $this->element('div',
-                       'entity_consumer_secret',
-                       $consumer->consumer_secret);
-
-        $this->element('div',
-                       'entity_request_token_url',
-                       common_local_url('ApiOauthRequestToken'));
-
-        $this->element('div', 'entity_access_token_url', common_local_url('ApiOauthAccessToken'));
 
-        $this->element('div', 'entity_authorize_url', common_local_url('ApiOauthAuthorize'));
+        $this->elementStart('dl');
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Consumer key'));
+        $this->element('dd', null, $consumer->consumer_key);
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Consumer secret'));
+        $this->element('dd', null, $consumer->consumer_secret);
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Request token URL'));
+        $this->element('dd', null, common_local_url('ApiOAuthRequestToken'));
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Access token URL'));
+        $this->element('dd', null, common_local_url('ApiOAuthAccessToken'));
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Authorize URL'));
+        $this->element('dd', null, common_local_url('ApiOAuthAuthorize'));
+        $this->elementEnd('dl');
 
         $this->element('p', 'note',
             // TRANS: Note on the OAuth application page about signature support.