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

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

diff --git a/lib/profilesection.php b/lib/profilesection.php
index 31658afe2d5423e5bd1aba92272abcd613734671..53002912bc7341b8f62001abb83b51b0ccc37066 100644 (file)
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -46,13 +46,13 @@ define('PROFILES_PER_SECTION', 6);
  * @link     http://status.net/
  */
 
-class ProfileSection extends Section
+abstract class ProfileSection extends Section
 {
     function showContent()
     {
         $profiles = $this->getProfiles();
 
-        if (!$profiles) {
+        if (!$profiles->N) {
             return false;
         }
 
@@ -78,24 +78,17 @@ class ProfileSection extends Section
     {
         $this->out->elementStart('tr');
         $this->out->elementStart('td');
-        $this->out->elementStart('span', 'vcard');
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                       $profile->fullname :
-                                       $profile->nickname,
+        $this->out->elementStart('a', array('title' => $profile->getBestName(),
                                        'href' => $profile->profileurl,
                                        'rel' => 'contact member',
-                                       'class' => 'url'));
-        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
+                                       'class' => 'h-card u-url'));
+        $avatarUrl = $profile->avatarUrl(AVATAR_MINI_SIZE);
+        $this->out->element('img', array('src' => $avatarUrl,
                                     'width' => AVATAR_MINI_SIZE,
                                     'height' => AVATAR_MINI_SIZE,
-                                    'class' => 'avatar photo',
-                                    'alt' =>  ($profile->fullname) ?
-                                    $profile->fullname :
-                                    $profile->nickname));
-        $this->out->element('span', 'fn nickname', $profile->nickname);
+                                    'class' => 'avatar u-photo',
+                                    'alt' => $profile->getBestName()));
         $this->out->elementEnd('a');
-        $this->out->elementEnd('span');
         $this->out->elementEnd('td');
         if (isset($profile->value)) {
             $this->out->element('td', 'value', $profile->value);