X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fprofilesection.php;h=53002912bc7341b8f62001abb83b51b0ccc37066;hb=refs%2Fheads%2Fupstream-changes%2Fgoogle-analytics-removal;hp=d463a07b0825e0d0bb69d2110173d99785e7b1e5;hpb=3ebbc1c3886a67dcc83ca4f906bdd375d599e86b;p=quix0rs-gnu-social.git

diff --git a/lib/profilesection.php b/lib/profilesection.php
index d463a07b08..53002912bc 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Base class for sections showing lists of people
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Widget
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,19 +40,19 @@ define('PROFILES_PER_SECTION', 6);
  * group, or site.
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @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);