Merge branch 'lists_fixes' into 1.0.x

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

diff --git a/lib/profileaction.php b/lib/profileaction.php
index 5e4e0f52a0e14bf1b4cc12988d6976d7934d89e0..bdd7f9144dda3b887c83de0e44e0ab2821dc1614 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ProfileAction extends OwnerDesignAction
 {
     var $page    = null;
@@ -74,6 +73,7 @@ class ProfileAction extends OwnerDesignAction
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when calling a profile action without specifying a user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -81,6 +81,7 @@ class ProfileAction extends OwnerDesignAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -96,6 +97,7 @@ class ProfileAction extends OwnerDesignAction
         $this->showSubscriptions();
         $this->showSubscribers();
         $this->showGroups();
+        $this->showLists();
         $this->showStatistics();
     }
 
@@ -122,7 +124,10 @@ class ProfileAction extends OwnerDesignAction
                                          'class' => 'section'));
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
             $this->elementStart('h2');
-            $this->statsSectionLink('subscriptions', _('Subscriptions'));
+            // TRANS: H2 text for user subscription statistics.
+            $this->statsSectionLink('subscriptions', _('Following'));
+            $this->text(' ');
+            $this->text($this->profile->subscriptionCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -131,16 +136,11 @@ class ProfileAction extends OwnerDesignAction
                 $pml = new ProfileMiniList($profile, $this);
                 $cnt = $pml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user subscription statistics if the user has no subscriptions.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                $this->statsSectionLink('subscriptions', _('All subscriptions'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscriptionsMiniList', array($this));
         }
         $this->elementEnd('div');
@@ -156,7 +156,10 @@ class ProfileAction extends OwnerDesignAction
         if (Event::handle('StartShowSubscribersMiniList', array($this))) {
 
             $this->elementStart('h2');
-            $this->statsSectionLink('subscribers', _('Subscribers'));
+            // TRANS: H2 text for user subscriber statistics.
+            $this->statsSectionLink('subscribers', _('Followers'));
+            $this->text(' ');
+            $this->text($this->profile->subscriberCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -165,16 +168,11 @@ class ProfileAction extends OwnerDesignAction
                 $sml = new SubscribersMiniList($profile, $this);
                 $cnt = $sml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user subscriber statistics if user has no subscribers.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                $this->statsSectionLink('subscribers', _('All subscribers'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscribersMiniList', array($this));
         }
 
@@ -194,6 +192,7 @@ class ProfileAction extends OwnerDesignAction
         $this->elementStart('div', array('id' => 'entity_statistics',
                                          'class' => 'section'));
 
+        // TRANS: H2 text for user statistics.
         $this->element('h2', null, _('Statistics'));
 
         $profile = $this->profile;
@@ -201,40 +200,26 @@ class ProfileAction extends OwnerDesignAction
         $stats = array(
             array(
                 'id' => 'user-id',
+                // TRANS: Label for user statistics.
                 'label' => _('User ID'),
                 'value' => $profile->id,
             ),
             array(
                 'id' => 'member-since',
+                // TRANS: Label for user statistics.
                 'label' => _('Member since'),
                 'value' => date('j M Y', strtotime($profile->created))
             ),
-            array(
-                'id' => 'subscriptions',
-                'label' => _('Subscriptions'),
-                'link' => common_local_url('subscriptions', $actionParams),
-                'value' => $profile->subscriptionCount(),
-            ),
-            array(
-                'id' => 'subscribers',
-                'label' => _('Subscribers'),
-                'link' => common_local_url('subscribers', $actionParams),
-                'value' => $profile->subscriberCount(),
-            ),
-            array(
-                'id' => 'groups',
-                'label' => _('Groups'),
-                'link' => common_local_url('usergroups', $actionParams),
-                'value' => $profile->getGroups()->N,
-            ),
             array(
                 'id' => 'notices',
+                // TRANS: Label for user statistics.
                 'label' => _('Notices'),
                 'value' => $notice_count,
             ),
             array(
                 'id' => 'daily_notices',
-                // TRANS: Average count of posts made per day since account registration
+                // TRANS: Label for user statistics.
+                // TRANS: Average count of posts made per day since account registration.
                 'label' => _('Daily average'),
                 'value' => $daily_count
             )
@@ -271,27 +256,80 @@ class ProfileAction extends OwnerDesignAction
                                          'class' => 'section'));
         if (Event::handle('StartShowGroupsMiniList', array($this))) {
             $this->elementStart('h2');
+            // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
+            $this->text(' ');
+            $this->text($this->profile->getGroups()->N);
             $this->elementEnd('h2');
 
             if ($groups) {
                 $gml = new GroupMiniList($groups, $this->profile, $this);
                 $cnt = $gml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user user group membership statistics if user is not a member of any group.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
-            if ($cnt > GROUPS_PER_MINILIST) {
-                $this->elementStart('p');
-                $this->statsSectionLink('usergroups', _('All groups'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowGroupsMiniList', array($this));
         }
             $this->elementEnd('div');
     }
+
+    function showLists()
+    {
+        $cur = common_current_user();
+
+        $lists = $this->profile->getLists($cur);
+
+        if ($lists->N > 0) {
+            $this->elementStart('div', array('id' => 'entity_lists',
+                                             'class' => 'section'));
+
+            if (Event::handle('StartShowListsMiniList', array($this))) {
+
+                $url = common_local_url('peopletagsbyuser',
+                                        array('nickname' => $this->profile->nickname));
+
+                $this->elementStart('h2');
+                $this->element('a',
+                               array('href' => $url),
+                               // TRANS: H2 text for user list membership statistics.
+                               _('Lists'));
+                $this->text(' ');
+                $this->text($lists->N);
+                $this->elementEnd('h2');
+
+                $this->elementStart('ul');
+
+
+                $first = true;
+
+                while ($lists->fetch()) {
+                    if (!empty($lists->mainpage)) {
+                        $url = $lists->mainpage;
+                    } else {
+                        $url = common_local_url('showprofiletag',
+                                                array('tagger' => $this->profile->nickname,
+                                                      'tag'    => $lists->tag));
+                    }
+                    if (!$first) {
+                        $this->text(', ');
+                    } else {
+                        $first = false;
+                    }
+
+                    $this->element('a', array('href' => $url),
+                                   $lists->tag);
+                }
+
+                $this->elementEnd('ul');
+
+                Event::handle('EndShowListsMiniList', array($this));
+            }
+            $this->elementEnd('div');
+        }
+    }
 }
 
 class SubscribersMiniList extends ProfileMiniList
@@ -313,4 +351,3 @@ class SubscribersMiniListItem extends ProfileMiniListItem
         return $aAttrs;
     }
 }
-