Merge branch 'master' of gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / lib / applicationlist.php

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 23c727bd6124225864d072d78c0fc019045dd0e0..3abb1f8aa7c8fa81abbda9ae97d23ed00c71ca8e 100644 (file)
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -64,12 +64,12 @@ class ApplicationList extends Widget
         $this->application = $application;
         $this->owner       = $owner;
         $this->action      = $action;
-       $this->connections = $connections;
+        $this->connections = $connections;
     }
 
     function show()
     {
-        $this->out->elementStart('ul', array('id' => 'applications'));
+        $this->out->elementStart('ul', 'applications');
 
         $cnt = 0;
 
@@ -94,69 +94,68 @@ class ApplicationList extends Widget
         $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));
-       }
+        $this->out->elementStart('span', 'vcard author');
+        if (!$this->connections) {
+            $this->out->elementStart('a',
+                                     array('href' => common_local_url('showapplication',
+                                                                      array('id' => $this->application->id)),
+                                                                      'class' => 'url'));
 
-       if (!$this->connections) {
-
-           $this->out->elementStart('a',
-                                    array('href' =>
-                                          common_local_url('showapplication',
-                                                           array('nickname' => $user->nickname,
-                                                                 'id' => $this->application->id)),
-                                          'class' => 'url')
-                                    );
-
-           $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->raw($this->application->name);
-           $this->out->elementEnd('a');
-       }
-
-       $this->out->raw(' by ');
-
-       $this->out->elementStart('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');
-
-       $this->out->elementEnd('li');
+        } else {
+            $this->out->elementStart('a', array('href' =>  $this->application->source_url,
+                                                'class' => 'url'));
+        }
 
-       if ($this->connections) {
+        if (!empty($this->application->icon)) {
+            $this->out->element('img', array('src' => $this->application->icon,
+                                             'class' => 'photo avatar'));
+        }
 
-           $appUser = Oauth_application_user::getByKeys($this->owner, $this->application);
+        $this->out->element('span', 'fn', $this->application->name);
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
 
-           if (empty($appUser)) {
-               common_debug("empty appUser!");
-           }
+        $this->out->raw(' by ');
 
-           $this->out->elementStart('li');
+        $this->out->element('a', array('href' => $this->application->homepage,
+                                       'class' => 'url'),
+                                 $this->application->organization);
 
-           $access = ($this->application->access_type & Oauth_application::$writeAccess)
-             ? 'read-write' : 'read-only';
+        $this->out->element('p', 'note', $this->application->description);
+        $this->out->elementEnd('li');
 
-           $txt = 'Approved ' . common_exact_date($appUser->modified) .
-             " $access for access.";
+        if ($this->connections) {
+            $appUser = Oauth_application_user::getByKeys($this->owner, $this->application);
 
-           $this->out->raw($txt);
-           $this->out->elementEnd('li');
+            if (empty($appUser)) {
+                common_debug("empty appUser!");
+            }
 
-           // XXX: Add revoke access button
-       }
+            $this->out->elementStart('li');
+
+            $access = ($this->application->access_type & Oauth_application::$writeAccess)
+              ? 'read-write' : 'read-only';
+
+            $txt = 'Approved ' . common_date_string($appUser->modified) .
+              " - $access access.";
+
+            $this->out->raw($txt);
+            $this->out->elementEnd('li');
+
+            $this->out->elementStart('li', 'entity_revoke');
+            $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('id', $this->application->id);
+            $this->out->hidden('token', common_session_token());
+            $this->out->submit('revoke', _('Revoke'));
+            $this->out->elementEnd('fieldset');
+            $this->out->elementEnd('form');
+            $this->out->elementEnd('li');
+        }
     }
 
     /* Override this in subclasses. */
@@ -166,8 +165,4 @@ class ApplicationList extends Widget
         return;
     }
 
-    function highlight($text)
-    {
-        return htmlspecialchars($text);
-    }
 }