ENH: Added community policies bug :9580

Added check style library

Author: Charles Marion

core/Bootstrap.php

@@ -169,7 +169,7 @@ protected function _initConfig()
   protected function _initRouter()
     {
     $router = Zend_Controller_Front::getInstance()->getRouter();
-
+/*
     $route1 = new Zend_Controller_Router_Route(
         Zend_Registry::get('configGlobal')->webdav->path.'/:action/*',
         array(
@@ -178,7 +178,7 @@ protected function _initRouter()
             'action'     => ':action'
         )
     );
-    $router->addRoute('webdav', $route1);    
+    $router->addRoute('webdav', $route1);    */
 
     //Init Modules    
     $frontController = Zend_Controller_Front::getInstance();  

core/constant/community.php

@@ -1,5 +1,6 @@
 <?php
 define("MIDAS_COMMUNITY_PUBLIC", 0);
-define("MIDAS_COMMUNITY_SEMIPRIVATE", 1);
-define("MIDAS_COMMUNITY_PRIVATE", 2);
+define("MIDAS_COMMUNITY_PRIVATE", 1);
+define("MIDAS_COMMUNITY_CAN_JOIN", 1);
+define("MIDAS_COMMUNITY_INVITATION_ONLY", 0);
 ?>

core/controllers/AdminController.php

@@ -95,6 +95,7 @@ function manageAction()
           $communityDao->setName($formInfo->getValue('name'));
           $communityDao->setDescription($formInfo->getValue('description'));
           $communityDao->setPrivacy($formInfo->getValue('privacy'));
+          $communityDao->setCanJoin($formInfo->getValue('canJoin'));
           $this->Community->save($communityDao);
           echo JsonComponent::encode(array(true,$this->t('Changes saved'),$formInfo->getValue('name')));
           }
@@ -155,6 +156,8 @@ function manageAction()
     $description->setValue($communityDao->getDescription());
     $privacy=$formInfo->getElement('privacy');
     $privacy->setValue($communityDao->getPrivacy());
+    $canJoin=$formInfo->getElement('canJoin');
+    $canJoin->setValue($communityDao->getCanJoin());
     $submit=$formInfo->getElement('submit');
     $submit->setLabel($this->t('Save'));
     $this->view->infoForm=$this->getFormAsArray($formInfo);
@@ -240,7 +243,9 @@ function viewAction()
       throw new Zend_Exception("This community doesn't exist  or you don't have the permissions.");
       }
     $joinCommunity=$this->_getParam('joinCommunity'); 
-    if($this->userSession->Dao!=null&&isset($joinCommunity)&&$communityDao->getPrivacy()==MIDAS_COMMUNITY_PUBLIC)
+    $canJoin=$communityDao->getCanJoin()==MIDAS_COMMUNITY_CAN_JOIN;
+    $this->view->canJoin=$canJoin;
+    if($canJoin&&$this->userSession->Dao!=null&&isset($joinCommunity)&&$communityDao->getPrivacy()==MIDAS_COMMUNITY_PUBLIC)
       {
       $member_group=$communityDao->getMemberGroup();
       $this->Group->addUser($member_group,$this->userSession->Dao);
@@ -315,8 +320,9 @@ function createAction()
        $name = $form->getValue('name');
        $description = $form->getValue('description');
        $privacy = $form->getValue('privacy');
+       $canJoin = $form->getValue('canJoin');
 
-       $communityDao = $this->Community->createCommunity($name,$description,$privacy,$this->userSession->Dao);
+       $communityDao = $this->Community->createCommunity($name,$description,$privacy,$this->userSession->Dao,$canJoin);
        $this->_redirect("/community/".$communityDao->getKey());
        }
      else

core/controllers/CommunityController.php

@@ -359,7 +359,7 @@ public function userpageAction()
       }
     else
       {
-      $this->User->plusOneView($userDao);
+      $this->User->incrementViewCount($userDao);
       }
     $this->view->feeds=$this->Feed->getFeedsByUser($this->userSession->Dao,$userDao);
 

core/controllers/UserController.php

@@ -16,18 +16,24 @@ public function createCreateForm()
     $description = new Zend_Form_Element_Textarea('description');
 
     $privacy = new Zend_Form_Element_Radio('privacy');
-    $privacy->addMultiOptions( array(
-                 MIDAS_COMMUNITY_PUBLIC => $this->t("Public (Folders are public. Everyone can join the community)"),
-                 MIDAS_COMMUNITY_PRIVATE => $this->t("Private (Folders are private. Only invited users can join the community)"),
-                 MIDAS_COMMUNITY_SEMIPRIVATE => $this->t("Semi-private (Contain public and private folders. Only invited users can join the community)")
+    $privacy->addMultiOptions( array(                 
+                 MIDAS_COMMUNITY_PRIVATE => $this->t("Private, only member can see the community"),
+                 MIDAS_COMMUNITY_PUBLIC => $this->t("Public, everyone can see the community"),
                   ))
             ->setRequired(true)
             ->setValue(MIDAS_COMMUNITY_PUBLIC);
+    
+    $canJoin = new Zend_Form_Element_Radio('canJoin');
+    $canJoin->addMultiOptions( array(
+                 MIDAS_COMMUNITY_CAN_JOIN => $this->t("Everyone can join the community"),
+                 MIDAS_COMMUNITY_INVITATION_ONLY => $this->t("Only invited users can join the community"),
+                  ))
+            ->setValue(MIDAS_COMMUNITY_CAN_JOIN);
 
     $submit = new  Zend_Form_Element_Submit('submit');
     $submit ->setLabel($this->t("Create"));
 
-    $form->addElements(array($name,$description,$privacy,$submit));
+    $form->addElements(array($name,$description,$privacy,$submit,$canJoin));
     return $form;
     }
 

core/controllers/forms/CommunityForm.php

@@ -0,0 +1,27 @@
+<?php
+
+class Upgrade_3_0_3 extends MIDASUpgrade
+{ 
+  public function preUpgrade()
+    {
+    
+    }
+    
+  public function mysql()
+    {
+    $sql = "ALTER TABLE community ADD COLUMN can_join integer DEFAULT 0; ";
+    $this->db->query($sql);
+    }
+    
+  public function pgsql()
+    {
+    $sql = "ALTER TABLE community ADD COLUMN can_join tinyint(4) NOT NULL  DEFAULT '0', ; ";
+    $this->db->query($sql);
+    }
+    
+  public function postUpgrade()
+    {
+    
+    }
+}
+?>

core/database/upgrade/3.0.3.php

@@ -18,6 +18,7 @@ public function __construct()
       'admingroup_id' => array('type' => MIDAS_DATA),
       'moderatorgroup_id' => array('type' => MIDAS_DATA),
       'membergroup_id' => array('type' => MIDAS_DATA),
+      'can_join' => array('type' => MIDAS_DATA),
       'view' => array('type' => MIDAS_DATA),
       'folder' => array('type' => MIDAS_MANY_TO_ONE, 'model' => 'Folder', 'parent_column' => 'folder_id', 'child_column' => 'folder_id'),
       'public_folder' => array('type' => MIDAS_MANY_TO_ONE, 'model' => 'Folder', 'parent_column' => 'publicfolder_id', 'child_column' => 'folder_id'),
@@ -47,22 +48,35 @@ function incrementViewCount($communityDao)
     } //end incrementViewCount
 
   /** Create a community.
-   *  privacy: MIDAS_COMMUNITY_PUBLIC, MIDAS_COMMUNITY_SEMIPRIVATE, MIDAS_COMMUNITY_PRIVATE
+   *  privacy: MIDAS_COMMUNITY_PUBLIC, MIDAS_COMMUNITY_PRIVATE
    *  */
-  function createCommunity($name,$description,$privacy,$user)
+  function createCommunity($name,$description,$privacy,$user,$canJoin=null)
     {
     $name = ucfirst($name);  
     if($this->getByName($name)!==false)
       {
       throw new Zend_Exception("Community already exists.");
       }
 
+    if($canJoin==null||$privacy==MIDAS_COMMUNITY_PRIVATE)
+      {
+      if($privacy==MIDAS_COMMUNITY_PRIVATE)
+        {
+        $canJoin=MIDAS_COMMUNITY_INVITATION_ONLY;
+        }
+      else
+        {
+        $canJoin=MIDAS_COMMUNITY_CAN_JOIN;
+        }
+      }
+      
     $this->loadDaoClass('CommunityDao');       
     $communityDao=new CommunityDao();
     $communityDao->setName($name);
     $communityDao->setDescription($description);
     $communityDao->setPrivacy($privacy);
     $communityDao->setCreation(date('c'));
+    $communityDao->setCanJoin($canJoin);
     $this->save($communityDao);
 
     $modelLoad = new MIDAS_ModelLoader();

core/models/base/CommunityModelBase.php

@@ -148,7 +148,7 @@ protected function _getFeeds($loggedUserDao,$userDao=null,$communityDao=null,$po
                           $this->database->getDB()->quoteInto('f2c.community_id = ? ',$communityDao->getKey())
                           .' AND f.feed_id = f2c.feed_id'  ,array());
       }
-    
+    $sql->order(array('f.date DESC'));
     $rowset = $this->database->fetchAll($sql);
     $rowsetAnalysed=array();
     foreach ($rowset as $keyRow=>$row)

core/models/pdo/FeedModel.php

@@ -4,7 +4,7 @@ form#createCommunityForm label{
 
 form#createCommunityForm div.radioElement label{
   float: inherit!important;
-  width: 300px!important;
+  width: 400px!important;
 }
 
 form#createCommunityForm div.radioElement ul{
@@ -13,3 +13,16 @@ form#createCommunityForm div.radioElement ul{
   padding: 0px 0px 0px 0px;
   width: 300px!important;
 }
+form#createCommunityForm div.radioElement br{
+  display:none;
+}
+form#createCommunityForm div.radioElement h4{
+  margin-bottom: 4px;
+}
+
+form#createCommunityForm div.radioElement #canJoinDiv{
+  margin-left: 10px;
+  color: grey;
+}
+
+