BUG: refs #453. Admins can now see all private feeds

Also fixed a bug where feed related to a community invitation was not removed
when the community invitation was deleted as a result of user deletion, which
caused the feed page to crash. Admins will see the recipient of a community
invitation in the feed now instead of just seeing "invited you to join the
community".

Author: zachmullen

core/controllers/FeedController.php

@@ -37,6 +37,7 @@ function init()
   public function indexAction()
     {
     $this->view->feeds = $this->Feed->getGlobalFeeds($this->userSession->Dao);
+    $this->view->loggedUser = $this->userSession->Dao;
     $this->view->itemThumbnails = $this->Item->getRandomThumbnails($this->userSession->Dao, 0, 12, true);
     $this->view->nUsers = $this->User->getCountAll();
     $this->view->nCommunities = $this->Community->getCountAll();

core/models/base/UserModelBase.php

@@ -103,7 +103,8 @@ public function delete($user)
     $invitations = $user->getInvitations();
     foreach($invitations as $invitation)
       {
-      $ciModel->delete($invitation);
+      //Must call removeInvitation instead of delete so the corresponding feed is also deleted
+      $ciModel->removeInvitation($invitation->getCommunity(), $user);
       }
 
     // Delete this user's folder tree recursively

core/models/pdo/FeedModel.php

@@ -160,24 +160,28 @@ protected function getFeeds($loggedUserDao, $userDao = null, $communityDao = nul
           ->setIntegrityCheck(false)
           ->from(array('f' => 'feed'))
           ->limit($limit);
-    $sql ->joinLeft(array('fpu' => 'feedpolicyuser'), '
-                  f.feed_id = fpu.feed_id AND '.$this->database->getDB()->quoteInto('fpu.policy >= ?', $policy).'
-                     AND '.$this->database->getDB()->quoteInto('fpu.user_id = ? ', $userId).' ', array('userpolicy' => 'fpu.policy'))
-        ->joinLeft(array('fpg' => 'feedpolicygroup'), '
-                        f.feed_id = fpg.feed_id AND '.$this->database->getDB()->quoteInto('fpg.policy >= ?', $policy).'
-                           AND ( '.$this->database->getDB()->quoteInto('fpg.group_id = ? ', MIDAS_GROUP_ANONYMOUS_KEY).' OR
-                                fpg.group_id IN (' .new Zend_Db_Expr(
-                                $this->database->select()
-                                     ->setIntegrityCheck(false)
-                                     ->from(array('u2g' => 'user2group'),
-                                            array('group_id'))
-                                     ->where('u2g.user_id = ?', $userId)
-                                     ) .'))', array('grouppolicy' => 'fpg.policy'))
-        ->where(
-         '(
-          fpu.feed_id is not null or
-          fpg.feed_id is not null)'
-          );
+
+    if(!$isAdmin)
+      {
+      $sql->joinLeft(array('fpu' => 'feedpolicyuser'), '
+                    f.feed_id = fpu.feed_id AND '.$this->database->getDB()->quoteInto('fpu.policy >= ?', $policy).'
+                       AND '.$this->database->getDB()->quoteInto('fpu.user_id = ? ', $userId).' ', array('userpolicy' => 'fpu.policy'))
+          ->joinLeft(array('fpg' => 'feedpolicygroup'), '
+                          f.feed_id = fpg.feed_id AND '.$this->database->getDB()->quoteInto('fpg.policy >= ?', $policy).'
+                             AND ( '.$this->database->getDB()->quoteInto('fpg.group_id = ? ', MIDAS_GROUP_ANONYMOUS_KEY).' OR
+                                  fpg.group_id IN (' .new Zend_Db_Expr(
+                                  $this->database->select()
+                                       ->setIntegrityCheck(false)
+                                       ->from(array('u2g' => 'user2group'),
+                                              array('group_id'))
+                                       ->where('u2g.user_id = ?', $userId)
+                                       ) .'))', array('grouppolicy' => 'fpg.policy'))
+          ->where(
+           '(
+            fpu.feed_id is not null or
+            fpg.feed_id is not null)'
+            );
+      }
 
     if($userDao != null)
       {

core/views/element/feed.phtml

@@ -46,7 +46,15 @@ PURPOSE.  See the above copyright notices for more information.
           echo "{$view->t("added the community")} <a href='{$view->webroot}/community/{$feed->getRessource()->getKey()}'>".$view->slicename($feed->getRessource()->getName(),30)."</a>";
           break;
         case MIDAS_FEED_COMMUNITY_INVITATION:
-          echo "{$view->t("invited you to the community")} <a href='{$view->webroot}/community/{$feed->getRessource()->getCommunity()->getKey()}'>".$view->slicename($feed->getRessource()->getCommunity()->getName(),30)."</a>";
+          if($view->loggedUser && $view->loggedUser->getKey() == $feed->getRessource()->getUser()->getKey())
+            {
+            echo $view->t('invited you to the community');
+            }
+          else
+            {
+            echo $view->t('invited').' '.$view->linkuser($feed->getRessource()->getUser()).' '.$view->t('to the community');
+            }
+          echo  " <a href='{$view->webroot}/community/{$feed->getRessource()->getCommunity()->getKey()}'>".$view->slicename($feed->getRessource()->getCommunity()->getName(),30)."</a>";
           break;
         case MIDAS_FEED_UPDATE_COMMUNITY:
         case MIDAS_FEED_CREATE_FOLDER: