0009676: Community groups issue

Author: Charles Marion

core/AppController.php

@@ -183,7 +183,14 @@ public function preDispatch()
       $this->logged = false;
       }
 
-    Zend_Registry::set('userSession', $user);
+    if(isset($user))
+      {
+      Zend_Registry::set('userSession', $user);
+      }
+    else
+      {
+      Zend_Registry::set('userSession', null);
+      }
 
     $this->view->lang = Zend_Registry::get('configGlobal')->application->lang;
     //create a global javascript json array

core/models/base/UserModelBase.php

@@ -92,6 +92,18 @@ function incrementViewCount($userDao)
       {
       throw new Zend_Exception("Error param.");
       }
+     $user = Zend_Registry::get('userSession');
+    if(isset($user))
+      {
+      if(isset($user->viewedUsers[$userDao->getKey()]))
+        {
+        return;
+        }
+      else
+        {
+        $user->viewedUsers[$userDao->getKey()] = true;
+        }
+      }
     $userDao->view++;
     $this->save($userDao);
     }//end incrementViewCount

core/models/pdo/GroupModel.php

@@ -44,6 +44,14 @@ function addUser($group, $user)
       {
       throw new Zend_Exception("Should be an user.");
       }
+    
+    $community = $group->getCommunity();
+    $groupMember = $community->getMemberGroup();
+    if($groupMember->getKey() != $group->getKey())
+      {
+      $this->addUser($groupMember, $user);
+      }
+    
     $this->database->link('users', $group, $user);
     } // end function addItem
 

core/views/community/manage.phtml

@@ -254,16 +254,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
       echo "</ul>";
       ?>
    </div>
-  
-     <div class="sideElementLast genericStats">
-    <h1>Stats</h1>  
-    
-    <?php
-      echo "<ul>";
-      echo "  <li>".count($this->members)." {$this->t("member")}".((count($this->members)>1)?'s':'')."</li>";
-      echo "</ul>";
-      ?>
-   </div>
+
 
     <div class="sideElementFirst viewAction">
     <h1>Actions</h1>