Merge remote-tracking branch 'statusnet/master'

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

diff --git a/actions/oauthappssettings.php b/actions/oauthappssettings.php
index 6c0670b17bfecc31605fd9316a6aa5394eda2a3d..c93a0a1580a158a718ef84efd0dd68f115229d61 100644 (file)
--- a/actions/oauthappssettings.php
+++ b/actions/oauthappssettings.php
@@ -31,8 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/settingsaction.php';
 require_once INSTALLDIR . '/lib/applicationlist.php';
+require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
 
 /**
  * Show a user's registered OAuth applications
@@ -56,6 +56,7 @@ class OauthappssettingsAction extends SettingsAction
         $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
 
         if (!common_logged_in()) {
+            // TRANS: Message displayed to an anonymous user trying to view OAuth application list.
             $this->clientError(_('You must be logged in to list your applications.'));
             return false;
         }
@@ -71,6 +72,7 @@ class OauthappssettingsAction extends SettingsAction
 
     function title()
     {
+        // TRANS: Page title for OAuth applications
         return _('OAuth applications');
     }
 
@@ -82,6 +84,7 @@ class OauthappssettingsAction extends SettingsAction
 
     function getInstructions()
     {
+        // TRANS: Page instructions for OAuth applications
         return _('Applications you have registered');
     }
 
@@ -100,6 +103,7 @@ class OauthappssettingsAction extends SettingsAction
 
         $application = new Oauth_application();
         $application->owner = $user->id;
+        $application->whereAdd("name != 'anonymous'");
         $application->limit($offset, $limit);
         $application->orderBy('created DESC');
         $application->find();
@@ -119,6 +123,7 @@ class OauthappssettingsAction extends SettingsAction
             array('href' => common_local_url('newapplication'),
                   'class' => 'more'
             ),
+            // TRANS: Link description to add a new OAuth application.
             'Register a new application');
         $this->elementEnd('p');
 
@@ -132,6 +137,7 @@ class OauthappssettingsAction extends SettingsAction
 
     function showEmptyListMessage()
     {
+        // TRANS: Empty list message on page with OAuth applications.
         $message = sprintf(_('You have not registered any applications yet.'));
 
         $this->elementStart('div', 'guide');
@@ -160,7 +166,5 @@ class OauthappssettingsAction extends SettingsAction
                               'Try again, please.'));
             return;
         }
-
     }
-
 }