Removed plugin Google-Analytics as this is free/libre and decentralized

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

diff --git a/lib/applicationlist.php b/lib/applicationlist.php
index 3141ea97413a44db07a03d1ddf442cf8ee7805f7..ab51a73096c50c637dd6cc078f1c5fddde2a5daa 100644 (file)
--- a/lib/applicationlist.php
+++ b/lib/applicationlist.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
@@ -23,18 +22,12 @@
  * @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/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/widget.php';
-
-define('APPS_PER_PAGE', 20);
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Widget to show a list of OAuth applications
@@ -45,7 +38,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 */
@@ -54,21 +46,17 @@ class ApplicationList extends Widget
     /** Owner of this list */
     var $owner = null;
 
-    /** Action object using us. */
-    var $action = null;
-
-    function __construct($application, $owner=null, $action=null)
+    function __construct($application, Profile $owner, Action $out=null)
     {
-        parent::__construct($action);
+        parent::__construct($out);
 
         $this->application = $application;
         $this->owner       = $owner;
-        $this->action      = $action;
     }
 
     function show()
     {
-        $this->out->elementStart('ul', 'applications xoxo');
+        $this->out->elementStart('ul', 'applications');
 
         $cnt = 0;
 
@@ -77,7 +65,7 @@ class ApplicationList extends Widget
             if($cnt > APPS_PER_PAGE) {
                 break;
             }
-            $this->showapplication();
+            $this->showApplication();
         }
 
         $this->out->elementEnd('ul');
@@ -87,53 +75,35 @@ class ApplicationList extends Widget
 
     function showApplication()
     {
+        $this->out->elementStart('li', array('class' => 'application h-entry',
+                                             'id'    => 'oauthclient-' . $this->application->id));
+
+        $this->out->elementStart('a', array('href' => common_local_url('showapplication',
+                                                                       array('id' => $this->application->id)),
+                                            'class' => 'h-card'));
+
+        if (!empty($this->application->icon)) {
+            $this->out->element('img', array('src' => $this->application->icon,
+                                             'class' => 'avatar u-photo'));
+        }
+
+        $this->out->text($this->application->name);
+        $this->out->elementEnd('a');
+
+        $this->out->raw(' by ');
+
+        $this->out->element('a', array('href' => $this->application->homepage,
+                                       'class' => 'u-url'),
+                            $this->application->organization);
+
+        $this->out->element('p', 'note', $this->application->description);
+        $this->out->elementEnd('li');
 
-        $user = common_current_user();
-
-        $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->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');
     }
 
     /* Override this in subclasses. */
-
     function showOwnerControls()
     {
         return;
     }
-
-    function highlight($text)
-    {
-        return htmlspecialchars($text);
-    }
 }