X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fapplicationlist.php;h=ee968590e80cd0967d8953da02d15448dff842cd;hb=a480ff5605202c9e1123c027336401a335178aea;hp=23c727bd6124225864d072d78c0fc019045dd0e0;hpb=0b90f7645e5bd54c99c6fb7c1fe105e183b9e8c1;p=quix0rs-gnu-social.git

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 23c727bd61..ee968590e8 100644
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
@@ -23,7 +22,7 @@
  * @category  Application
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 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/
  */
@@ -45,7 +44,6 @@ define('APPS_PER_PAGE', 20);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApplicationList extends Widget
 {
     /** Current application, application query */
@@ -57,19 +55,18 @@ class ApplicationList extends Widget
     /** Action object using us. */
     var $action = null;
 
-    function __construct($application, $owner=null, $action=null, $connections = false)
+    function __construct($application, $owner=null, $action=null)
     {
         parent::__construct($action);
 
         $this->application = $application;
         $this->owner       = $owner;
         $this->action      = $action;
-	$this->connections = $connections;
     }
 
     function show()
     {
-        $this->out->elementStart('ul', array('id' => 'applications'));
+        $this->out->elementStart('ul', 'applications');
 
         $cnt = 0;
 
@@ -88,86 +85,224 @@ class ApplicationList extends Widget
 
     function showApplication()
     {
-
         $user = common_current_user();
 
-        $this->out->elementStart('li', array('class' => 'application',
-                                             'id' => 'oauthclient-' . $this->application->id));
-
-	if (!empty($this->application->icon)) {
-	    $this->out->element('img', array('src' => $this->application->icon));
-	}
-
-	if (!$this->connections) {
+        $this->out->elementStart(
+            'li',
+            array(
+                'class' => 'application',
+                'id'    => 'oauthclient-' . $this->application->id
+            )
+        );
 
-	    $this->out->elementStart('a',
-				     array('href' =>
-					   common_local_url('showapplication',
-							    array('nickname' => $user->nickname,
-								  'id' => $this->application->id)),
-					   'class' => 'url')
-				     );
+        $this->out->elementStart('span', 'vcard author');
 
-	    $this->out->raw($this->application->name);
-	    $this->out->elementEnd('a');
-	} else {
-	    $this->out->elementStart('a',
-				     array('href' =>  $this->application->source_url,
-					   'class' => 'url'));
+        $this->out->elementStart(
+            'a',
+            array(
+                'href' => common_local_url(
+                    'showapplication',
+                    array('id' => $this->application->id)),
+                    'class' => 'url'
+            )
+        );
+
+        if (!empty($this->application->icon)) {
+            $this->out->element(
+                'img',
+                array(
+                    'src' => $this->application->icon,
+                    'class' => 'photo avatar'
+                )
+            );
+        }
 
-	    $this->out->raw($this->application->name);
-	    $this->out->elementEnd('a');
-	}
+        $this->out->element('span', 'fn', $this->application->name);
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
 
-	$this->out->raw(' by ');
+        $this->out->raw(' by ');
 
-	$this->out->elementStart('a',
+        $this->out->element(
+            'a',
             array(
-		  'href' => $this->application->homepage,
-		  'class' => 'url'
-                )
-				 );
-	$this->out->raw($this->application->organization);
-	$this->out->elementEnd('a');
-
-	$this->out->elementStart('p', 'note');
-        $this->out->raw($this->application->description);
-        $this->out->elementEnd('p');
+                'href' => $this->application->homepage,
+                'class' => 'url'
+            ),
+            $this->application->organization
+        );
 
-	$this->out->elementEnd('li');
+        $this->out->element('p', 'note', $this->application->description);
+        $this->out->elementEnd('li');
 
-	if ($this->connections) {
+    }
 
-	    $appUser = Oauth_application_user::getByKeys($this->owner, $this->application);
+    /* Override this in subclasses. */
+    function showOwnerControls()
+    {
+        return;
+    }
+}
 
-	    if (empty($appUser)) {
-		common_debug("empty appUser!");
-	    }
+/**
+ * Widget to show a list of connected OAuth clients
+ *
+ * @category Application
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class ConnectedAppsList extends Widget
+{
+    /** Current connected application query */
+    var $connection = null;
 
-	    $this->out->elementStart('li');
+    /** Owner of this list */
+    var $owner = null;
 
-	    $access = ($this->application->access_type & Oauth_application::$writeAccess)
-	      ? 'read-write' : 'read-only';
+    /** Action object using us. */
+    var $action = null;
 
-	    $txt = 'Approved ' . common_exact_date($appUser->modified) .
-	      " $access for access.";
+    function __construct($connection, $owner=null, $action=null)
+    {
+        parent::__construct($action);
 
-	    $this->out->raw($txt);
-	    $this->out->elementEnd('li');
+        common_debug("ConnectedAppsList constructor");
 
-	    // XXX: Add revoke access button
-	}
+        $this->connection = $connection;
+        $this->owner       = $owner;
+        $this->action      = $action;
     }
 
     /* Override this in subclasses. */
-
     function showOwnerControls()
     {
         return;
     }
 
-    function highlight($text)
+    function show()
     {
-        return htmlspecialchars($text);
+        $this->out->elementStart('ul', 'applications');
+
+        $cnt = 0;
+
+        while ($this->connection->fetch()) {
+            $cnt++;
+            if($cnt > APPS_PER_PAGE) {
+                break;
+            }
+            $this->showConnection();
+        }
+
+        $this->out->elementEnd('ul');
+
+        return $cnt;
+    }
+
+    function showConnection()
+    {
+        $app = Oauth_application::getKV('id', $this->connection->application_id);
+
+        $this->out->elementStart(
+            'li',
+            array(
+                'class' => 'application',
+                'id'    => 'oauthclient-' . $app->id
+            )
+        );
+
+        $this->out->elementStart('span', 'vcard author');
+
+        $this->out->elementStart(
+            'a',
+            array(
+                'href' => $app->source_url,
+                'class' => 'url'
+            )
+        );
+
+        if (!empty($app->icon)) {
+            $this->out->element(
+                'img',
+                array(
+                    'src' => $app->icon,
+                    'class' => 'photo avatar'
+                )
+            );
+        }
+        if ($app->name != 'anonymous') {
+            $this->out->element('span', 'fn', $app->name);
+        }
+        $this->out->elementEnd('a');
+
+        if ($app->name == 'anonymous') {
+            // TRANS: Name for an anonymous application in application list.
+            $this->out->element('span', 'fn', _('Unknown application'));
+        }
+
+        $this->out->elementEnd('span');
+
+        if ($app->name != 'anonymous') {
+            // @todo FIXME: i18n trouble.
+            // TRANS: Message has a leading space and a trailing space. Used in application list.
+            // TRANS: Before this message the application name is put, behind it the organisation that manages it.
+            $this->out->raw(_(' by '));
+
+            $this->out->element(
+                'a',
+                array(
+                    'href' => $app->homepage,
+                    'class' => 'url'
+                ),
+                $app->organization
+            );
+        }
+
+        // TRANS: Application access type
+        $readWriteText = _('read-write');
+        // TRANS: Application access type
+        $readOnlyText = _('read-only');
+
+        $access = ($this->connection->access_type & Oauth_application::$writeAccess)
+            ? $readWriteText : $readOnlyText;
+        $modifiedDate = common_date_string($this->connection->modified);
+        // TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+        $txt = sprintf(_('Approved %1$s - "%2$s" access.'), $modifiedDate, $access);
+
+        // @todo FIXME: i18n trouble.
+        $this->out->raw(" - $txt");
+        if (!empty($app->description)) {
+            $this->out->element(
+                'p', array('class' => 'application_description'),
+                $app->description
+            );
+        }
+        $this->out->element(
+            'p', array(
+            'class' => 'access_token'),
+            // TRANS: Access token in the application list.
+            // TRANS: %s are the first 7 characters of the access token.
+            sprintf(_('Access token starting with: %s'), substr($this->connection->token, 0, 7))
+        );
+
+        $this->out->elementStart(
+            'form',
+            array(
+                'id' => 'form_revoke_app',
+                'class' => 'form_revoke_app',
+                'method' => 'POST',
+                'action' => common_local_url('oauthconnectionssettings')
+            )
+        );
+        $this->out->elementStart('fieldset');
+        $this->out->hidden('oauth_token', $this->connection->token);
+        $this->out->hidden('token', common_session_token());
+        // TRANS: Button label in application list to revoke access to user data.
+        $this->out->submit('revoke', _m('BUTTON','Revoke'));
+        $this->out->elementEnd('fieldset');
+        $this->out->elementEnd('form');
+
+        $this->out->elementEnd('li');
     }
 }