X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fprofileaction.php;h=79008f3bfcb2397d6b13fdba0448732fc243a39d;hb=931753229328d0ebdf80b76b898a736c06dc70a4;hp=4f2a403e28c54750ec72784f7baf59fa327365ba;hpb=90e6eab68e6d6d020b0c227727d6733678a6e106;p=quix0rs-gnu-social.git

diff --git a/lib/profileaction.php b/lib/profileaction.php
index 4f2a403e28..79008f3bfc 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 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/
  */
@@ -46,52 +46,74 @@ 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
+class ProfileAction extends ManagedAction
 {
     var $page    = null;
-    var $profile = null;
     var $tag     = null;
 
-    function prepare($args)
+    protected $target  = null;    // Profile that we're showing
+
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $nickname_arg = $this->arg('nickname');
-        $nickname     = common_canonical_nickname($nickname_arg);
+        try {
+            $nickname_arg = $this->arg('nickname');
+            $nickname     = common_canonical_nickname($nickname_arg);
 
-        // Permanent redirect on non-canonical nickname
+            // Permanent redirect on non-canonical nickname
 
-        if ($nickname_arg != $nickname) {
-            $args = array('nickname' => $nickname);
-            if ($this->arg('page') && $this->arg('page') != 1) {
-                $args['page'] = $this->arg['page'];
+            if ($nickname_arg != $nickname) {
+                $args = array('nickname' => $nickname);
+                if ($this->arg('page') && $this->arg('page') != 1) {
+                    $args['page'] = $this->arg['page'];
+                }
+                common_redirect(common_local_url($this->getActionName(), $args), 301);
             }
-            common_redirect(common_local_url($this->trimmed('action'), $args), 301);
-            return false;
-        }
+            $this->user = User::getKV('nickname', $nickname);
 
-        $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);
+            }
 
-        if (!$this->user) {
-            // TRANS: Client error displayed when calling a profile action without specifying a user.
-            $this->clientError(_('No such user.'), 404);
-            return false;
-        }
+            $this->target = $this->user->getProfile();
+        } catch (NicknameException $e) {
+            $id = (int)$this->arg('id');
+            $this->target = Profile::getKV('id', $id);
+
+            if (!$this->target instanceof Profile) {
+                // TRANS: Error message displayed when referring to a user without a profile.
+                $this->serverError(_m('Profile ID does not exist.'));
+            }
 
-        $this->profile = $this->user->getProfile();
+            if ($this->target->isLocal()) {
+                // For local users when accessed by id number, redirect to
+                // the same action but using the nickname as argument.
+                common_redirect(common_local_url($this->getActionName(),
+                                                array('nickname'=>$user->getNickname())));
+            }
+        }
 
-        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;
+        if ($this->target->hasRole(Profile_role::SILENCED) &&
+            (empty($this->scoped) || !$this->scoped->hasRight(Right::SILENCEUSER))) {
+            throw new ClientException(_('This profile has been silenced by site moderators'), 403);
         }
 
+        // backwards compatibility until all actions are fixed to use $this->target
+        $this->profile = $this->target;
+
         $this->tag = $this->trimmed('tag');
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
         common_set_returnto($this->selfUrl());
         return true;
     }
 
+    function isReadOnly(array $args=array())
+    {
+        return true;
+    }
+
     function showSections()
     {
         $this->showSubscriptions();
@@ -111,15 +133,13 @@ class ProfileAction extends OwnerDesignAction
     private function statsSectionLink($actionClass, $title, $cssClass='')
     {
         $this->element('a', array('href' => common_local_url($actionClass,
-                                                             array('nickname' => $this->profile->nickname)),
+                                                             array('nickname' => $this->target->getNickname())),
                                   'class' => $cssClass),
                        $title);
     }
 
     function showSubscriptions()
     {
-        $profile = $this->profile->getSubscriptions(0, PROFILES_PER_MINILIST + 1);
-
         $this->elementStart('div', array('id' => 'entity_subscriptions',
                                          'class' => 'section'));
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
@@ -127,18 +147,16 @@ class ProfileAction extends OwnerDesignAction
             // TRANS: H2 text for user subscription statistics.
             $this->statsSectionLink('subscriptions', _('Following'));
             $this->text(' ');
-            $this->text($this->profile->subscriptionCount());
+            $this->text($this->target->subscriptionCount());
             $this->elementEnd('h2');
-
-            $cnt = 0;
-
-            if (!empty($profile)) {
+        
+            try {
+                $profile = $this->target->getSubscribed(0, PROFILES_PER_MINILIST + 1);
                 $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)'));
-                }
+                $pml->show();
+            } catch (NoResultException $e) {
+                // TRANS: Text for user subscription statistics if the user has no subscription
+                $this->element('p', null, _('(None)'));
             }
 
             Event::handle('EndShowSubscriptionsMiniList', array($this));
@@ -148,8 +166,6 @@ class ProfileAction extends OwnerDesignAction
 
     function showSubscribers()
     {
-        $profile = $this->profile->getSubscribers(0, PROFILES_PER_MINILIST + 1);
-
         $this->elementStart('div', array('id' => 'entity_subscribers',
                                          'class' => 'section'));
 
@@ -159,18 +175,16 @@ class ProfileAction extends OwnerDesignAction
             // TRANS: H2 text for user subscriber statistics.
             $this->statsSectionLink('subscribers', _('Followers'));
             $this->text(' ');
-            $this->text($this->profile->subscriberCount());
+            $this->text($this->target->subscriberCount());
             $this->elementEnd('h2');
 
-            $cnt = 0;
-
-            if (!empty($profile)) {
+            try {
+                $profile = $this->target->getSubscribers(0, PROFILES_PER_MINILIST + 1);
                 $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)'));
-                }
+                $sml->show();
+            } catch (NoResultException $e) {
+                // TRANS: Text for user subscriber statistics if user has no subscribers.
+                $this->element('p', null, _('(None)'));
             }
 
             Event::handle('EndShowSubscribersMiniList', array($this));
@@ -181,8 +195,8 @@ class ProfileAction extends OwnerDesignAction
 
     function showStatistics()
     {
-        $notice_count = $this->profile->noticeCount();
-        $age_days     = (time() - strtotime($this->profile->created)) / 86400;
+        $notice_count = $this->target->noticeCount();
+        $age_days     = (time() - strtotime($this->target->created)) / 86400;
         if ($age_days < 1) {
             // Rather than extrapolating out to a bajillion...
             $age_days = 1;
@@ -195,7 +209,7 @@ class ProfileAction extends OwnerDesignAction
         // TRANS: H2 text for user statistics.
         $this->element('h2', null, _('Statistics'));
 
-        $profile = $this->profile;
+        $profile = $this->target;
         $actionParams = array('nickname' => $profile->nickname);
         $stats = array(
             array(
@@ -250,7 +264,7 @@ class ProfileAction extends OwnerDesignAction
 
     function showGroups()
     {
-        $groups = $this->profile->getGroups(0, GROUPS_PER_MINILIST + 1);
+        $groups = $this->target->getGroups(0, GROUPS_PER_MINILIST + 1);
 
         $this->elementStart('div', array('id' => 'entity_groups',
                                          'class' => 'section'));
@@ -259,23 +273,15 @@ class ProfileAction extends OwnerDesignAction
             // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
             $this->text(' ');
-            $this->text($this->profile->getGroups()->N);
+            $this->text($this->target->getGroupCount());
             $this->elementEnd('h2');
 
-            if ($groups) {
-                $gml = new GroupMiniList($groups, $this->profile, $this);
+            if ($groups instanceof User_group) {
+                $gml = new GroupMiniList($groups, $this->target, $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');
-                // TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
-                $this->statsSectionLink('usergroups', _('All groups'), 'more');
-                $this->elementEnd('p');
+            } else {
+                // TRANS: Text for user user group membership statistics if user is not a member of any group.
+                $this->element('p', null, _('(None)'));
             }
 
             Event::handle('EndShowGroupsMiniList', array($this));
@@ -285,7 +291,7 @@ class ProfileAction extends OwnerDesignAction
 
     function showLists()
     {
-        $lists = $this->profile->getLists();
+        $lists = $this->target->getLists($this->scoped);
 
         if ($lists->N > 0) {
             $this->elementStart('div', array('id' => 'entity_lists',
@@ -293,32 +299,39 @@ class ProfileAction extends OwnerDesignAction
 
             if (Event::handle('StartShowListsMiniList', array($this))) {
 
+                $url = common_local_url('peopletagsbyuser',
+                                        array('nickname' => $this->target->getNickname()));
+
                 $this->elementStart('h2');
-                // TRANS: H2 text for user list membership statistics.
-                $this->statsSectionLink('userlists', _('Lists'));
+                $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');
 
-                $cur = common_current_user();
+
+                $first = true;
 
                 while ($lists->fetch()) {
-                    if (!$lists->private ||
-                        ($lists->private && !empty($cur) && $cur->id == $profile->id)) {
-                        if (!empty($lists->mainpage)) {
-                            $url = $lists->mainpage;
-                        } else {
-                            $url = common_local_url('showprofiletag',
-                                                    array('tagger' => $this->profile->nickname,
-                                                          'tag'    => $lists->tag));
-                        }
-                        $this->elementStart('li');
-                        $this->element('a', array('href' => $url),
-                                       $lists->tag);
-                        $this->elementEnd('li');
+                    if (!empty($lists->mainpage)) {
+                        $url = $lists->mainpage;
+                    } else {
+                        $url = common_local_url('showprofiletag',
+                                                array('tagger' => $this->target->getNickname(),
+                                                      'tag'    => $lists->tag));
+                    }
+                    if (!$first) {
+                        $this->text(', ');
+                    } else {
+                        $first = false;
                     }
+
+                    $this->element('a', array('href' => $url),
+                                   $lists->tag);
                 }
 
                 $this->elementEnd('ul');
@@ -332,7 +345,7 @@ class ProfileAction extends OwnerDesignAction
 
 class SubscribersMiniList extends ProfileMiniList
 {
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new SubscribersMiniListItem($profile, $this->action);
     }