Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/showapplication.php b/actions/showapplication.php
index adfd17a06cd5fbfeb9de95d92a1451028fc3ccb8..c10883942f5f19f5377494262fdf7a5832adf08b 100644 (file)
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -65,25 +65,23 @@ class ShowApplicationAction extends Action
      *
      * @return success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $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.
             $this->clientError(_('You must be logged in to view an application.'));
-            return false;
         }
 
         if (empty($this->application)) {
             // TRANS: Client error displayed trying to display a non-existing OAuth application.
             $this->clientError(_('No such application.'), 404);
-            return false;
         }
 
         $cur = common_current_user();
@@ -91,7 +89,6 @@ class ShowApplicationAction extends Action
         if ($cur->id != $this->owner->id) {
             // TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.
             $this->clientError(_('You are not the owner of this application.'), 401);
-            return false;
         }
 
         return true;
@@ -104,7 +101,7 @@ class ShowApplicationAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -115,7 +112,6 @@ class ShowApplicationAction extends Action
             if (!$token || $token != common_session_token()) {
                 // TRANS: Client error displayed when the session token does not match or is not given.
                 $this->clientError(_('There was a problem with your session token.'));
-                return;
             }
 
             if ($this->arg('reset')) {
@@ -151,20 +147,20 @@ class ShowApplicationAction extends Action
 
         $consumer = $this->application->getConsumer();
 
-        $this->elementStart('div', 'entity_profile vcard');
+        $this->elementStart('div', 'entity_profile h-card');
         // TRANS: Header on the OAuth application page.
         $this->element('h2', null, _('Application profile'));
         if (!empty($this->application->icon)) {
             $this->element('img', array('src' => $this->application->icon,
-                                        'class' => 'photo logo entity_depiction'));
+                                        'class' => 'u-photo logo entity_depiction'));
         }
 
         $this->element('a', array('href' =>  $this->application->source_url,
-                                  'class' => 'url fn entity_fn'),
+                                  'class' => 'u-url p-name entity_fn'),
                             $this->application->name);
 
         $this->element('a', array('href' =>  $this->application->homepage,
-                                  'class' => 'url entity_org'),
+                                  'class' => 'u-url entity_org'),
                             $this->application->organization);
 
         $this->element('div',
@@ -174,7 +170,7 @@ class ShowApplicationAction extends Action
         $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;
@@ -261,13 +257,13 @@ class ShowApplicationAction extends Action
         $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'));
+        $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'));
+        $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->element('dd', null, common_local_url('ApiOAuthAuthorize'));
         $this->elementEnd('dl');
 
         $this->element('p', 'note',