".$user->getLastname()." ".$user->getFirstname()."
Par ".$this->getUser()->getLastname()." ".$this->getUser()->getFirstname(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($key->toString(),$userid,$groupid,$message); + $response = new Response(json_encode($output)); $response->headers->set('Content-Type', 'application/json'); return $response; } - public function usergroupdelAction(Request $request) + public function usergroupdelAction(Request $request,$access="config") { // S'assurer que c'est un appel ajax if (!$request->isXmlHttpRequest()) { @@ -457,15 +522,21 @@ class GroupController extends Controller throw $this->createNotFoundException('Permission denied'); $data = $em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(array("user"=>$userid,"group"=>$groupid)); + $user=$em->getRepository("CadolesCoreBundle:User")->find($userid); + $message="Désinscription de l'utilisateur
".$user->getLastname()." ".$user->getFirstname()."
Par ".$this->getUser()->getLastname()." ".$this->getUser()->getFirstname();; + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($data->getKeyvalue(),$userid,$groupid,$message); + + $em->remove($data); $em->flush(); + $response = new Response(json_encode($output)); $response->headers->set('Content-Type', 'application/json'); return $response; } - public function switchmanagerAction(Request $request) + public function switchmanagerAction(Request $request,$access="config") { // S'assurer que c'est un appel ajax if (!$request->isXmlHttpRequest()) { @@ -496,15 +567,18 @@ class GroupController extends Controller // Initialisation de l'enregistrement $data = new Group(); $data->setFgopen(false); - $data->setFgcanshare(false); + $data->setFgcanshare(($access=="user")); $data->setFgcancreatepage(false); $data->setFgcancreatecalendar(false); $data->setFgcancreateblog(false); + if($access=="user") $data->setOwner($this->getUser()); // Création du formulaire $form = $this->createForm(GroupType::class,$data,array( "mode"=>"submit", + "fgall"=>false, "updatelimite"=>false, + "access"=>$access, "masteridentity"=> $this->GetParameter("masteridentity"), "portal_activate"=>$this->getParameter("portal_activate") ) @@ -533,12 +607,24 @@ class GroupController extends Controller $em->persist($data); $em->flush(); + // Si acces par user on ajoute forcement le owner comme membre du groupe en tant que manager + if($access=="user") { + $key = Uuid::uuid4(); + $usergroup=new Usergroup; + $usergroup->setUser($this->getUser()); + $usergroup->setGroup($data); + $usergroup->setFgmanager(true); + $usergroup->setKeyvalue($key); + $em->persist($usergroup); + $em->flush(); + } + // On s'assure que le groupe de travail à bien page d'accueil / calendrier / blog associé // Sinon on les génère - $this->ctrlFgcanshare($data); + $this->ctrlFgcanshare($data,$access); // Retour à la liste - return $this->redirectToRoute("cadoles_core_config_group_users",["id"=>$data->getId()]); + return $this->redirectToRoute("cadoles_core_".$access."_group_users",["id"=>$data->getId()]); } // Affichage du formulaire @@ -549,10 +635,10 @@ class GroupController extends Controller return $this->render($this->labelentity.':edit.html.twig', [ 'useheader' => true, 'usemenu' => false, - 'usesidebar' => true, + 'usesidebar' => ($access=="config"), $this->labeldata => $data, 'mode' => 'submit', - 'access' => 'access', + 'access' => $access, 'icons' => $icons, 'iconsuser' => $iconsuser, 'form' => $form->createView() @@ -568,6 +654,8 @@ class GroupController extends Controller // Création du formulaire $form = $this->createForm(GroupType::class,$data,array( "mode" => "update", + "access" => $access, + "fgall" => $data->getFgAll(), "updatelimite" => ($data->getFgAll()||$data->getFgTemplate()), "masteridentity" => $this->GetParameter("masteridentity"), "portal_activate" => $this->getParameter("portal_activate"), @@ -602,21 +690,21 @@ class GroupController extends Controller // On s'assure que le groupe de travail à bien page d'accueil / calendrier / blog associé // Sinon on les génère - $this->ctrlFgcanshare($data); + $this->ctrlFgcanshare($data,$access); // Retour à la liste - return $this->redirectToRoute($this->labelroute); + return $this->redirectToRoute("cadoles_core_".$access."_group"); } $icons=$em->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]); $iconsuser=null; - if($access=="user") $iconsuser=$em()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>$this->getUser()]); + if($access=="user") $iconsuser=$em->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>$this->getUser()]); // Affichage du formulaire return $this->render($this->labelentity.':edit.html.twig', [ 'useheader' => true, 'usemenu' => false, - 'usesidebar' => true, + 'usesidebar' => ($access=="config"), $this->labeldata => $data, 'mode' => 'update', 'access' => $access, @@ -626,10 +714,12 @@ class GroupController extends Controller ]); } - public function deleteAction($id,Request $request) + public function deleteAction($id,Request $request, $access="config") { + $em = $this->getDoctrine()->getManager(); + // Seule role admin peut supprimer un groupe - if(!$this->isGranted('ROLE_ADMIN')) + if($access=="config"&&!$this->isGranted('ROLE_ADMIN')) return $this->redirectToRoute($this->labelroute); // Récupération de l'enregistrement courant @@ -656,25 +746,31 @@ class GroupController extends Controller // Sur validation if ($form->get('submit')->isClicked() && $form->isValid()) { - $em = $this->getDoctrine()->getManager(); $em->remove($data); $em->flush(); - return $this->redirectToRoute($this->labelroute); + return $this->redirectToRoute("cadoles_core_".$access."_group"); } + $icons=$em->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]); + $iconsuser=null; + if($access=="user") $iconsuser=$em->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>$this->getUser()]); + // Affichage du formulaire return $this->render($this->labelentity.':edit.html.twig', [ 'useheader' => true, 'usemenu' => false, - 'usesidebar' => true, + 'usesidebar' => ($access=="config"), $this->labeldata => $data, 'mode' => 'delete', + 'access' => $access, + 'icons' => $icons, + 'iconsuser' => $iconsuser, 'form' => $form->createView() ]); } - public function usersAction($id,Request $request) + public function usersAction($id,Request $request, $access="config") { // Récupération de l'enregistrement courant $data=$this->getData($id); @@ -683,12 +779,13 @@ class GroupController extends Controller return $this->render($this->labelentity.':users.html.twig', [ 'useheader' => true, 'usemenu' => false, - 'usesidebar' => true, + 'usesidebar' => ($access=="config"), + 'access' => $access, $this->labeldata => $data ]); } - protected function ctrlFgcanshare($group) { + protected function ctrlFgcanshare($group,$access) { $em = $this->getDoctrine()->getManager(); if($group->getFgcanshare()) { @@ -697,6 +794,7 @@ class GroupController extends Controller $page=$this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->clonePage(null,$group->getPagetemplate()); $group->addPage($page); $page->setName("Groupe = ".$group->getLabel()); + if($access=="user")$page->setUser($this->getUser()); $em->persist($page); $em->persist($group); @@ -713,6 +811,7 @@ class GroupController extends Controller $calendar->addGroup($group); $calendar->setColor($group->getColor()); $calendar->setType(0); + if($access=="user")$calendar->setUser($this->getUser()); $em->persist($calendar); $em->flush(); @@ -724,6 +823,7 @@ class GroupController extends Controller $blog->setName("Groupe = ".$group->getLabel()); $blog->addGroup($group); + if($access=="user")$blog->setUser($this->getUser()); $em->persist($blog); $em->flush(); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index 3d9f5d7a..c3a84ff5 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -22,6 +22,7 @@ use Cadoles\CoreBundle\Entity\UserGroup; use Cadoles\CoreBundle\Entity\UserModo; use Cadoles\CoreBundle\Entity\Niveau01; use Cadoles\CoreBundle\Entity\Niveau02; +use Cadoles\WebsocketBundle\Entity\Message; use Cadoles\CoreBundle\Form\UserType; @@ -66,7 +67,7 @@ class UserController extends Controller $viewniveau02=$this->getParameter('viewniveau02'); // Nombre total d'enregistrement - if($this->isGranted('ROLE_ADMIN')) + if($this->isGranted('ROLE_ADMIN')||$access=="user") $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult(); elseif($this->isGranted('ROLE_MODO')) { $usermodo=$this->get('security.token_storage')->getToken()->getUser()->getId(); @@ -79,7 +80,7 @@ class UserController extends Controller ->setParameter("userid", $usermodo) ->getQuery()->getSingleScalarResult(); } - elseif($this->isGranted('ROLE_USER')) { + elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) { $niveau01=$this->get('security.token_storage')->getToken()->getUser()->getNiveau01(); $total = $em->createQueryBuilder() ->select('COUNT(user)') @@ -93,7 +94,7 @@ class UserController extends Controller if($search["value"]=="") $totalf = $total; else { - if($this->isGranted('ROLE_ADMIN')) + if($this->isGranted('ROLE_ADMIN')||$access=="user") $totalf= $em->createQueryBuilder() ->select('COUNT(user)') ->from('CadolesCoreBundle:User','user') @@ -117,7 +118,7 @@ class UserController extends Controller ->setParameter("value", "%".$search["value"]."%") ->getQuery() ->getSingleScalarResult(); - elseif($this->isGranted('ROLE_USER')) + elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) $totalf= $em->createQueryBuilder() ->select('COUNT(user)') ->from('CadolesCoreBundle:User','user') @@ -141,7 +142,7 @@ class UserController extends Controller // Parcours des Enregistrement $qb = $em->createQueryBuilder(); - if($this->isGranted('ROLE_ADMIN')) { + if($this->isGranted('ROLE_ADMIN')||$access=="user") { $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01'); $qb->where('user.niveau01=niveau01.id'); } @@ -152,7 +153,7 @@ class UserController extends Controller ->andWhere("usermodo.user = :userid") ->setParameter("userid", $usermodo); } - elseif($this->isGranted('ROLE_USER')) { + elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) { $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01'); $qb->where('user.niveau01=niveau01.id') ->andwhere("user.niveau01 = :niveau01") @@ -310,14 +311,20 @@ class UserController extends Controller // Ajout des groupes foreach($lstgroups as $idgroup) { - $group= new UserGroup(); + $group=$em->getRepository("CadolesCoreBundle:Group")->find($idgroup); - $group->setUser($data); - $datagroup = $em->getRepository("CadolesCoreBundle:Group")->find($idgroup); - $group->setGroup($datagroup); + $key = Uuid::uuid4(); - $em->persist($group); + $usergroup= new UserGroup(); + $usergroup->setUser($data); + $datagroup = $group; + $usergroup->setGroup($datagroup); + $usergroup->setKeyvalue($key); + $em->persist($usergroup); $em->flush(); + + $message="Inscription de l'utilisateur
".$data->getLastname()." ".$data->getFirstname()."
Par ".$this->getUser()->getLastname()." ".$this->getUser()->getFirstname(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($key->toString(),$iduser,$idgroup,$message); } // Ajout des modos @@ -420,25 +427,35 @@ class UserController extends Controller $em->persist($data); $em->flush(); + // On récupère les groupes et on cacule ceux à ajouter ou à supprimer $lstgroups=array_filter(explode(",",$form->get("linkgroups")->getData())); $removegroups=array_diff($oldlstgroups,$lstgroups); $addgroups=array_diff($lstgroups,$oldlstgroups); + // Ajout des nouveaux groupes foreach($addgroups as $idgroup) { - $group= new UserGroup(); + $group=$em->getRepository("CadolesCoreBundle:Group")->find($idgroup); + + $key = Uuid::uuid4(); - $group->setUser($data); - $datagroup = $em->getRepository("CadolesCoreBundle:Group")->find($idgroup); - $group->setGroup($datagroup); - - $em->persist($group); + $usergroup= new UserGroup(); + $usergroup->setUser($data); + $datagroup = $group; + $usergroup->setGroup($datagroup); + $usergroup->setKeyvalue($key); + $em->persist($usergroup); $em->flush(); + + $message="Inscription de l'utilisateur
".$data->getLastname()." ".$data->getFirstname()."
Par ".$this->getUser()->getLastname()." ".$this->getUser()->getFirstname(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($key->toString(),$id,$idgroup,$message); } // Suppression des groupes obsolètes foreach($removegroups as $idgroup) { + $group=$em->getRepository("CadolesCoreBundle:Group")->find($idgroup); + // Lien Group User $usergroups = $em ->createQueryBuilder() ->select('table') @@ -449,6 +466,9 @@ class UserController extends Controller ->getQuery() ->getResult(); foreach($usergroups as $usergroup) { + $message="Désinscription de l'utilisateur
".$data->getLastname()." ".$data->getFirstname()."
Par ".$this->getUser()->getLastname()." ".$this->getUser()->getFirstname(); + $websocket = $this->container->get('cadoles.websocket.pushmessage')->send($usergroup->getKeyvalue(),$id,$idgroup,$message); + $em->remove($usergroup); $em->flush(); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncUser.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncUser.php index fb032587..17d88fef 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncUser.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncUser.php @@ -10,6 +10,8 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\EntityManager; +use Ramsey\Uuid\Uuid; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; class syncUser implements EventSubscriber { @@ -143,9 +145,11 @@ class syncUser implements EventSubscriber if($fgall) { $data=$this->em->getRepository('CadolesCoreBundle:UserGroup')->findBy(array('user'=>$user,'group'=>$fgall[0])); if(!$data) { + $key = Uuid::uuid4(); $data=new UserGroup(); $data->setUser($user); $data->setGroup($fgall[0]); + $data->setKeyvalue($key); $this->em->persist($data); $this->em->flush(); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php index 0eb79a37..76186403 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php @@ -33,174 +33,180 @@ class GroupType extends AbstractType if($options["portal_activate"]) { $choices=array("oui" => "1","non" => "0"); - $builder->add("fgcanshare", - ChoiceType::class,array( - "label" =>"Groupe de Travail", - 'disabled' => ($options["mode"]=="delete"?true:false), - "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), - "choices" => $choices - ) - ); - $builder->add('pagetemplate', - EntityType::class,[ - "class" => "CadolesPortalBundle:Page", - "label" => "Modèle de Page pour l'accueil du groupe", - "required" => false, - "choice_label" => "name", - "query_builder"=> function (EntityRepository $er) { - return $er->createQueryBuilder('page')->where('page.parentfor=:parentfor')->setParameter('parentfor', 'group'); - }, - "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false), - "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)) - ]); - - $builder->add("fgcancreatepage", - ChoiceType::class,array( - "label" =>"Permission de créer des Pages", - 'disabled' => ($options["mode"]=="delete"?true:false), - "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), - "choices" => $choices - ) - ); - - $builder->add("fgcancreatecalendar", - ChoiceType::class,array( - "label" =>"Permission de créer des Calendriers", - 'disabled' => ($options["mode"]=="delete"?true:false), - "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), - "choices" => $choices - ) - ); - - $builder->add("fgcancreateblog", - ChoiceType::class,array( - "label" =>"Permission de créer des Blogs", - 'disabled' => ($options["mode"]=="delete"?true:false), - "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), - "choices" => $choices - ) - ); - - $builder->add('pages', Select2EntityType::class, [ - 'label' => 'Afficher les Pages', - 'class' => 'CadolesPortalBundle:Page', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_page_seleclist', - 'primary_key' => 'id', - 'text_property' => 'name', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des pages', - ]); - - $builder->add('items', Select2EntityType::class, [ - 'label' => 'Afficher les Items', - 'class' => 'CadolesPortalBundle:Item', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_item_seleclist', - 'primary_key' => 'id', - 'text_property' => 'title', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des items', - ]); - - $builder->add('alerts', Select2EntityType::class, [ - 'label' => 'Afficher les Annonces', - 'class' => 'CadolesPortalBundle:Alert', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_alert_seleclist', - 'primary_key' => 'id', - 'text_property' => 'title', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des annonces', - ]); - - $builder->add('calendars', Select2EntityType::class, [ - 'label' => 'Afficher les Calendriers', - 'class' => 'CadolesPortalBundle:Calendar', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_calendar_seleclist', - 'primary_key' => 'id', - 'text_property' => 'name', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des calendriers', - ]); - - $builder->add('blogs', Select2EntityType::class, [ - 'label' => 'Afficher les Blogs', - 'class' => 'CadolesPortalBundle:Blog', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_blog_seleclist', - 'primary_key' => 'id', - 'text_property' => 'name', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des blogs', - ]); - - $builder->add('fluxs', Select2EntityType::class, [ - 'label' => 'Afficher les Flux', - 'class' => 'CadolesPortalBundle:Flux', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_flux_seleclist', - 'primary_key' => 'id', - 'text_property' => 'title', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des flux', - ]); + if(!$options["fgall"]) { + $builder->add("fgcanshare", + ChoiceType::class,array( + "label" =>"Groupe de Travail", + 'disabled' => ($options["mode"]=="delete"||$options["access"]=="user"?true:false), + "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), + "choices" => $choices + ) + ); - $builder->add('notices', Select2EntityType::class, [ - 'label' => 'Afficher les Chartes', - 'class' => 'CadolesPortalBundle:Notice', - 'multiple' => true, - 'remote_route' => 'cadoles_portal_config_ajax_notice_seleclist', - 'primary_key' => 'id', - 'text_property' => 'title', - 'minimum_input_length' => 0, - 'page_limit' => 100, - 'allow_clear' => true, - 'delay' => 250, - 'cache' => false, - 'cache_timeout' => 60000, - 'language' => 'fr', - 'placeholder' => 'Selectionner des chartes', - ]); + $builder->add('pagetemplate', + EntityType::class,[ + "class" => "CadolesPortalBundle:Page", + "label" => "Modèle de Page pour l'accueil du groupe", + "required" => false, + "choice_label" => "name", + "query_builder"=> function (EntityRepository $er) { + return $er->createQueryBuilder('page')->where('page.parentfor=:parentfor')->setParameter('parentfor', 'group'); + }, + "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false), + "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)) + ]); + } + + if($options["access"]=="config") { + $builder->add("fgcancreatepage", + ChoiceType::class,array( + "label" =>"Permission de créer des Pages", + 'disabled' => ($options["mode"]=="delete"?true:false), + "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), + "choices" => $choices + ) + ); + + $builder->add("fgcancreatecalendar", + ChoiceType::class,array( + "label" =>"Permission de créer des Calendriers", + 'disabled' => ($options["mode"]=="delete"?true:false), + "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), + "choices" => $choices + ) + ); + + $builder->add("fgcancreateblog", + ChoiceType::class,array( + "label" =>"Permission de créer des Blogs", + 'disabled' => ($options["mode"]=="delete"?true:false), + "attr" => array("class" => "form-control", "style" => "margin-bottom:15px"), + "choices" => $choices + ) + ); + + $builder->add('pages', Select2EntityType::class, [ + 'label' => 'Afficher les Pages', + 'class' => 'CadolesPortalBundle:Page', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_page_seleclist', + 'primary_key' => 'id', + 'text_property' => 'name', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des pages', + ]); + + $builder->add('items', Select2EntityType::class, [ + 'label' => 'Afficher les Items', + 'class' => 'CadolesPortalBundle:Item', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_item_seleclist', + 'primary_key' => 'id', + 'text_property' => 'title', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des items', + ]); + + $builder->add('alerts', Select2EntityType::class, [ + 'label' => 'Afficher les Annonces', + 'class' => 'CadolesPortalBundle:Alert', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_alert_seleclist', + 'primary_key' => 'id', + 'text_property' => 'title', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des annonces', + ]); + + $builder->add('calendars', Select2EntityType::class, [ + 'label' => 'Afficher les Calendriers', + 'class' => 'CadolesPortalBundle:Calendar', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_calendar_seleclist', + 'primary_key' => 'id', + 'text_property' => 'name', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des calendriers', + ]); + + $builder->add('blogs', Select2EntityType::class, [ + 'label' => 'Afficher les Blogs', + 'class' => 'CadolesPortalBundle:Blog', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_blog_seleclist', + 'primary_key' => 'id', + 'text_property' => 'name', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des blogs', + ]); + + $builder->add('fluxs', Select2EntityType::class, [ + 'label' => 'Afficher les Flux', + 'class' => 'CadolesPortalBundle:Flux', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_flux_seleclist', + 'primary_key' => 'id', + 'text_property' => 'title', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des flux', + ]); + + + $builder->add('notices', Select2EntityType::class, [ + 'label' => 'Afficher les Chartes', + 'class' => 'CadolesPortalBundle:Notice', + 'multiple' => true, + 'remote_route' => 'cadoles_portal_config_ajax_notice_seleclist', + 'primary_key' => 'id', + 'text_property' => 'title', + 'minimum_input_length' => 0, + 'page_limit' => 100, + 'allow_clear' => true, + 'delay' => 250, + 'cache' => false, + 'cache_timeout' => 60000, + 'language' => 'fr', + 'placeholder' => 'Selectionner des chartes', + ]); + } } $builder->add('idicon', HiddenType::class,['mapped'=> false,'data' => $options["idicon"]]); @@ -293,9 +299,11 @@ class GroupType extends AbstractType $resolver->setDefaults(array( 'data_class' => 'Cadoles\CoreBundle\Entity\Group', 'mode' => "string", + 'access' => "string", 'masteridentity' => "string", 'portal_activate' => "boolean", 'updatelimite' => "boolean", + 'fgall' => "boolean", 'idicon' => "string", )); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php index 998a4702..105ddeac 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php @@ -63,7 +63,7 @@ class UserType extends AbstractType ); if($options["access"]=="config") { - $choices=array("Utilisateur" => "ROLE_USER","Modérateur" => "ROLE_MODO","Administrateur" => "ROLE_ADMIN"); + $choices=array("Utilisateur" => "ROLE_USER","Animateur de Groupe" => "ROLE_ANIM","Modérateur" => "ROLE_MODO","Administrateur" => "ROLE_ADMIN"); $onfocus=($options["perm"]?"":"this.defaultIndex=this.selectedIndex;"); $onchange=($options["perm"]?"":"this.selectedIndex=this.defaultIndex;"); $readonly=($options["perm"]?"":" background-color: #eee;"); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Repository/GroupRepository.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Repository/GroupRepository.php index 69ce83aa..bf3922b8 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Repository/GroupRepository.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Repository/GroupRepository.php @@ -4,6 +4,8 @@ namespace Cadoles\CoreBundle\Repository; use Doctrine\Common\Collections\ArrayCollection; use Cadoles\CoreBundle\Entity\UserGroup; +use Ramsey\Uuid\Uuid; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; class GroupRepository extends \Doctrine\ORM\EntityRepository { @@ -56,9 +58,11 @@ class GroupRepository extends \Doctrine\ORM\EntityRepository foreach($retgroups as $retgroup) { $usergroup=$this->_em->getRepository('CadolesCoreBundle:UserGroup')->findBy(["user"=>$user,"group"=>$retgroup]); if(!$usergroup) { + $key = Uuid::uuid4(); $usergroup=new UserGroup(); $usergroup->setUser($user); $usergroup->setGroup($retgroup); + $usergroup->setKeyvalue($key); $this->_em->persist($usergroup); $this->_em->flush(); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml index 7b8b7960..1453779c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml @@ -249,15 +249,15 @@ cadoles_core_config_importuser_filectrl: defaults: { _controller: CadolesCoreBundle:User:importuserfilectrl } #-- Access user -cadoles_core_profil: +cadoles_core_user: path: /user defaults: { _controller: CadolesCoreBundle:User:profil } -cadoles_core_profil_user_ajax_list: +cadoles_core_user_user_ajax_list: path: /user/user/ajax/list defaults: { _controller: CadolesCoreBundle:User:ajaxlist, access: user } -cadoles_core_profil_users: +cadoles_core_user_users: path: /user/users defaults: { _controller: CadolesCoreBundle:User:list, access: user } @@ -311,50 +311,95 @@ cadoles_core_config_niveau02_ajax_list: #== Group ================================================================================================================ +#-- Access config cadoles_core_config_group: path: /config/group - defaults: { _controller: CadolesCoreBundle:Group:list } + defaults: { _controller: CadolesCoreBundle:Group:list, access: config } cadoles_core_config_group_submit: path: /config/group/submit - defaults: { _controller: CadolesCoreBundle:Group:submit } + defaults: { _controller: CadolesCoreBundle:Group:submit, access: config } cadoles_core_config_group_update: path: /config/group/update/{id} - defaults: { _controller: CadolesCoreBundle:Group:update } + defaults: { _controller: CadolesCoreBundle:Group:update, access: config } cadoles_core_config_group_delete: path: /config/group/delete/{id} - defaults: { _controller: CadolesCoreBundle:Group:delete } + defaults: { _controller: CadolesCoreBundle:Group:delete, access: config } cadoles_core_config_group_ajax_list: path: /config/group/ajax/list - defaults: { _controller: CadolesCoreBundle:Group:ajaxlist } + defaults: { _controller: CadolesCoreBundle:Group:ajaxlist, access: config } cadoles_core_config_group_users: path: /config/group/users/{id} - defaults: { _controller: CadolesCoreBundle:Group:users } + defaults: { _controller: CadolesCoreBundle:Group:users, access: config } cadoles_core_config_group_ajax_usersnotin: path: /config/group/ajax/usersnotin/{id} - defaults: { _controller: CadolesCoreBundle:Group:ajaxusersnotin } + defaults: { _controller: CadolesCoreBundle:Group:ajaxusersnotin, access: config } cadoles_core_config_group_ajax_usersin: path: /config/group/ajax/usersin/{id} - defaults: { _controller: CadolesCoreBundle:Group:ajaxusersin } + defaults: { _controller: CadolesCoreBundle:Group:ajaxusersin, access: config } cadoles_core_config_group_ajax_usergroup_add: path: /config/group/ajax/usergroupadd - defaults: { _controller: CadolesCoreBundle:Group:usergroupadd } + defaults: { _controller: CadolesCoreBundle:Group:usergroupadd, access: config } cadoles_core_config_group_ajax_usergroup_del: path: /config/group/ajax/usergroupdel - defaults: { _controller: CadolesCoreBundle:Group:usergroupdel } + defaults: { _controller: CadolesCoreBundle:Group:usergroupdel, access: config } cadoles_core_config_group_ajax_switchmanager: path: /config/group/ajax/switchmanager - defaults: { _controller: CadolesCoreBundle:Group:switchmanager } + defaults: { _controller: CadolesCoreBundle:Group:switchmanager, access: config } + +#-- Access user +cadoles_core_user_group: + path: /user/group + defaults: { _controller: CadolesCoreBundle:Group:list, access: user } +cadoles_core_user_group_ajax_list: + path: /user/group/ajax/list + defaults: { _controller: CadolesCoreBundle:Group:ajaxlist, access: user } + +cadoles_core_user_group_submit: + path: /user/group/submit + defaults: { _controller: CadolesCoreBundle:Group:submit, access: user } + +cadoles_core_user_group_update: + path: /user/group/update/{id} + defaults: { _controller: CadolesCoreBundle:Group:update, access: user } + +cadoles_core_user_group_delete: + path: /user/group/delete/{id} + defaults: { _controller: CadolesCoreBundle:Group:delete, access: user } + +cadoles_core_user_group_users: + path: /user/group/users/{id} + defaults: { _controller: CadolesCoreBundle:Group:users, access: user } + +cadoles_core_user_group_ajax_usersnotin: + path: /user/group/ajax/usersnotin/{id} + defaults: { _controller: CadolesCoreBundle:Group:ajaxusersnotin, access: user } + +cadoles_core_user_group_ajax_usersin: + path: /user/group/ajax/usersin/{id} + defaults: { _controller: CadolesCoreBundle:Group:ajaxusersin, access: user } + +cadoles_core_user_group_ajax_usergroup_add: + path: /user/group/ajax/usergroupadd + defaults: { _controller: CadolesCoreBundle:Group:usergroupadd, access: user } + +cadoles_core_user_group_ajax_usergroup_del: + path: /user/group/ajax/usergroupdel + defaults: { _controller: CadolesCoreBundle:Group:usergroupdel, access: user } + +cadoles_core_user_group_ajax_switchmanager: + path: /user/group/ajax/switchmanager + defaults: { _controller: CadolesCoreBundle:Group:switchmanager, access: user } #== Whitelist ============================================================================================================ cadoles_core_config_whitelist: diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig index d45af056..584bca1b 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig @@ -42,6 +42,9 @@
{{ app.session.get('appname') }}
Vous avez perdu votre connection
+ ou +Vous n'avez plus accès à cette page
+Vous allez être redirigé vers la page d'accueil
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig index 2b48434c..ed60747c 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig @@ -12,7 +12,7 @@ {% endif %} - {{ form_widget(form.submit) }} Annuler + {{ form_widget(form.submit) }} Annuler
@@ -96,7 +96,7 @@
- {% if form.fgcanshare is defined %}
+ {% if form.fgcancreatepage is defined %}
Permissions Portail
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
index 12055e4a..eec01ec2 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
@@ -1,13 +1,27 @@
{% extends '@CadolesCore/base.html.twig' %}
{% block pagewrapper %}
-
Gestion des Groupes
++ {%if access=="config" %} + Gestion des Groupes + {%else%} + Mes Groupes de Travail + {%endif%} +
- + {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_MODO') or is_granted('ROLE_ANIM') %} ++ {% if access=="config" %} + Ajouter + {% else %} + Créer un Groupe de Travail + {% endif %} +
+ {% endif %}
- Liste des Groupes
+ Liste des Groupes
@@ -21,10 +35,12 @@
Filtre
{% if portal_activate %}
Groupe de Travail
+ {% if access=="config" %}
Création Pages
Création Calendriers
Création Blogs
{% endif %}
+ {% endif %}
@@ -43,7 +59,7 @@
order: [[ 1, "asc" ]],
processing: true,
serverSide: true,
- ajax: "{{ path('cadoles_core_config_group_ajax_list') }}",
+ ajax: "{{ path('cadoles_core_'~access~'_group_ajax_list') }}",
});
});
{% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
index 1d9bbcd6..0a45f67a 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
@@ -3,8 +3,7 @@
{% block pagewrapper %}
Gestion des Utilisateurs
Groupe = {{ group.label }}
- - Fermer + Fermer
@@ -22,7 +21,9 @@
Avatar
Login
Email
- Manager
+ {% if group.fgcanshare %}
+ Manager
+ {% endif %}
@@ -45,8 +46,10 @@
Action
Avatar
Login
- Email
- Manager
+ Email
+ {% if group.fgcanshare %}
+ Manager
+ {% endif %}
@@ -60,13 +63,13 @@
{% block localjavascript %}
$(document).ready(function() {
$('#dataTablesnotin').DataTable({
- columnDefs: [ { "targets": 'no-sort', "orderable": false } ],
+ columnDefs: [ { "targets": 'no-sort', "orderable": false },{ "targets": 'no-visible', "visible": false } ],
responsive: true,
iDisplayLength: 100,
order: [[ 2, "asc" ]],
processing: true,
serverSide: true,
- ajax: "{{ path('cadoles_core_config_group_ajax_usersnotin',{'id':group.id}) }}",
+ ajax: "{{ path('cadoles_core_'~access~'_group_ajax_usersnotin',{'id':group.id}) }}",
});
$('#dataTablesin').DataTable({
@@ -77,10 +80,10 @@
processing: true,
serverSide: true,
ajax: {
- "url": "{{ path('cadoles_core_config_group_ajax_usersin',{'id':group.id}) }}",
+ "url": "{{ path('cadoles_core_'~access~'_group_ajax_usersin',{'id':group.id}) }}",
"data": function ( d ) {
return $.extend( {}, d, {
- "fgcanshare": {{ group.fgcanshare }}
+ "fgcanshare": "{{ group.fgcanshare }}"
});
}
},
@@ -96,7 +99,7 @@
$.ajax({
rowId: 2,
method: "POST",
- url: "{{ path('cadoles_core_config_group_ajax_usergroup_add') }}",
+ url: "{{ path('cadoles_core_'~access~'_group_ajax_usergroup_add') }}",
data: "userid="+userid+"&groupid="+{{ group.id }},
success: function(data, dataType)
{
@@ -118,7 +121,7 @@
$.ajax({
rowId: 2,
method: "POST",
- url: "{{ path('cadoles_core_config_group_ajax_usergroup_del') }}",
+ url: "{{ path('cadoles_core_'~access~'_group_ajax_usergroup_del') }}",
data: "userid="+userid+"&groupid="+{{ group.id }},
success: function(data, dataType)
{
@@ -139,7 +142,7 @@
function switchManager(id) {
$.ajax({
method: "POST",
- url: "{{ path('cadoles_core_config_group_ajax_switchmanager') }}",
+ url: "{{ path('cadoles_core_'~access~'_group_ajax_switchmanager') }}",
data: {
"group": {{ group.id }},
"user": id,
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/menu.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/menu.html.twig
index e0177647..f27594f0 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/menu.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/menu.html.twig
@@ -2,9 +2,10 @@
{% if is_granted('ROLE_ADMIN') or is_granted('ROLE_MODO') %}
{% endif %}
-
+
+
- 
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
index 81639abc..0965f5a3 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
@@ -54,7 +54,11 @@
- 
+ {% set avatar= "noavatar.png" %}
+ {% if user.avatar %}
+ {% set avatar= user.avatar %}
+ {% endif %}
+ 
{{ form_widget(form.avatar) }}
Modifier
@@ -134,7 +138,7 @@
+ {% set avatar= "noavatar.png" %}
+ {% if user.avatar %}
+ {% set avatar= user.avatar %}
+ {% endif %}
+
{{ form_widget(form.avatar) }}
Modifier
- Ajouter
+ Inscription à un Groupe
@@ -152,8 +156,8 @@ {% for group in user.groups %}
- {% if (access=="config" or group.group.fgopen) and not group.group.fgall and group.group.ldapfilter=="" and group.group.attributes =="" %}
- ";
- html+=""+$("#listgrouplabel"+id).html()+" ";
html+=" ";
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
index 01e25535..731b9d9b 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
@@ -68,7 +68,7 @@
ajax: "{{ path('cadoles_core_config_user_ajax_list') }}",
{% else %}
order: [[ 1, "asc" ]],
- ajax: "{{ path('cadoles_core_profil_user_ajax_list') }}",
+ ajax: "{{ path('cadoles_core_user_user_ajax_list') }}",
{% endif %}
});
});
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
index 088ce2ba..8e912633 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
@@ -43,6 +43,7 @@ class InitDataCommand extends ContainerAwareCommand
$activate_widopensondage = $this->getContainer()->getParameter('activate_widopensondage');
$activate_widpiwik = $this->getContainer()->getParameter('activate_widpiwik');
$activate_widwordpress = $this->getContainer()->getParameter('activate_widwordpress');
+ $activate_websocket = $this->getContainer()->getParameter('websocket_activate');
$output->writeln('PORTAL = Default Data');
@@ -670,22 +671,27 @@ class InitDataCommand extends ContainerAwareCommand
// Widget Chat
$entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1840);
- if(!$entityWidget) $entityWidget = new Widget();
- $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_chat.png"]);
- $entityWidget->setId(-1840);
- $entityWidget->setRoworder(2);
- $entityWidget->setIcon($entityicon);
- $entityWidget->setName('Chat');
- $entityWidget->setDescription("Conversation instantanée");
- $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_chat");
- $entityWidget->setHeight("1000");
- $entityWidget->setAutoajust(false);
- $entityWidget->setBorder(true);
- $entityWidget->setOpened(true);
- $entityWidget->setAccess(["config","user","group"]);
- $parameter = json_decode('{"fields": []}');
- $entityWidget->setParameter($parameter);
- $em->persist($entityWidget);
+ if($activate_websocket) {
+ if(!$entityWidget) $entityWidget = new Widget();
+ $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_chat.png"]);
+ $entityWidget->setId(-1840);
+ $entityWidget->setRoworder(2);
+ $entityWidget->setIcon($entityicon);
+ $entityWidget->setName('Chat');
+ $entityWidget->setDescription("Conversation instantanée");
+ $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_chat");
+ $entityWidget->setHeight("1000");
+ $entityWidget->setAutoajust(false);
+ $entityWidget->setBorder(true);
+ $entityWidget->setOpened(true);
+ $entityWidget->setAccess(["config","user","group"]);
+ $parameter = json_decode('{"fields": []}');
+ $entityWidget->setParameter($parameter);
+ $em->persist($entityWidget);
+ }
+ else {
+ $em->remove($entityWidget);
+ }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index 41902017..62e2bcbf 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -1816,7 +1816,7 @@ class PagewidgetController extends Controller
foreach($group->getUsers() as $usergroup) {
- array_push($members,$usergroup->getUser());
+ array_push($members,$usergroup);
}
}
}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php
index c7098048..3499e4c1 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php
@@ -46,10 +46,11 @@ class AlertType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogType.php
index 17177535..a8e2162e 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/BlogType.php
@@ -32,10 +32,11 @@ class BlogType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarType.php
index dc9f9362..2995ad5c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendarType.php
@@ -70,10 +70,11 @@ class CalendarType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
index ca05184a..7a757d3a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
@@ -45,10 +45,11 @@ class FluxType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
index e3b9db46..7ce824cd 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
@@ -58,10 +58,11 @@ class ItemType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/NoticeType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/NoticeType.php
index 1908c978..3995990f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/NoticeType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/NoticeType.php
@@ -53,10 +53,11 @@ class NoticeType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateEditorType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateEditorType.php
index ee313b62..2b3da20c 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateEditorType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateEditorType.php
@@ -48,10 +48,11 @@ class PageUpdateEditorType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateToolType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateToolType.php
index 8e805c16..f9ac93ca 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateToolType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateToolType.php
@@ -35,10 +35,11 @@ class PageUpdateToolType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateURLType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateURLType.php
index 05117a6e..24fd7c26 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateURLType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateURLType.php
@@ -44,10 +44,11 @@ class PageUpdateURLType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateWidgetType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateWidgetType.php
index 2252a3ca..69825363 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateWidgetType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateWidgetType.php
@@ -45,10 +45,11 @@ class PageUpdateWidgetType extends AbstractType
->add('roles', ChoiceType::class, [
"label" => 'Visible pour les Rôles',
"choices" => [
- "Visiteur" => 'ROLE_ANONYME',
- "Utilisateur" => 'ROLE_USER',
- "Modérateur" => 'ROLE_MODO',
- "Administateur" => 'ROLE_ADMIN',
+ "Visiteur" => 'ROLE_ANONYME',
+ "Utilisateur" => 'ROLE_USER',
+ "Animateur de Groupe" => 'ROLE_ANIM',
+ "Modérateur" => 'ROLE_MODO',
+ "Administateur" => 'ROLE_ADMIN',
],
"multiple" => true,
"expanded" => true,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
index 41fc8eea..4473b47a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/BlogRepository.php
@@ -68,6 +68,7 @@ class BlogRepository extends EntityRepository
// blogs partagées
$blogsshared=[];
+ /*
if($user) {
$blogsshared=$this->createQueryBuilder('blog')
->from('CadolesCoreBundle:Group','g')
@@ -94,6 +95,7 @@ class BlogRepository extends EntityRepository
$blogshared->setCanadd($this->getInwriter($user,$blogshared));
}
}
+ */
// Initialisation du calcul des blogs
$blogsadmin=new ArrayCollection();
@@ -102,7 +104,8 @@ class BlogRepository extends EntityRepository
foreach($roles as $role) {
$qb = $this->createQueryBuilder("blog");
$qb ->where($qb->expr()->like('blog.roles', $qb->expr()->literal("%$role%")))
- ->andWhere("blog.user is null");
+ ->andWhere("blog.user != :user or blog.user is null")
+ ->setParameter('user',$user);
$blogsroles=$qb->getQuery()->getResult();
foreach($blogsroles as $blogrole) {
@@ -114,7 +117,8 @@ class BlogRepository extends EntityRepository
foreach($groups as $group) {
$qb = $this->createQueryBuilder("blog");
$qb ->where(":group MEMBER OF blog.groups")
- ->andWhere("blog.user is null")
+ ->andWhere("blog.user != :user or blog.user is null")
+ ->setParameter('user',$user)
->setParameter("group",$group->getGroup());
$blogsgroups=$qb->getQuery()->getResult();
@@ -184,8 +188,6 @@ class BlogRepository extends EntityRepository
foreach($groups as $group) {
$qb = $this->createQueryBuilder("blog");
$qb ->where(":group MEMBER OF blog.groups")
- ->andWhere("blog.id=:id")
- ->andWhere("blog.user is null")
->andWhere("blog.id=:id")
->setParameter("id",$blog->getId())
->setParameter("group",$group->getGroup());
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
index 6fc928f0..0bbe6622 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendarRepository.php
@@ -58,24 +58,23 @@ class CalendarRepository extends EntityRepository
// Pages partagées
$calendarsshared=[];
+ /*
if($user) {
$calendarsshared=$this->createQueryBuilder('calendar')
->from('CadolesCoreBundle:Group','g')
->from('CadolesCoreBundle:UserGroup','ug')
- ->from('CadolesCoreBundle:UserGroup','proprio')
->where('g.fgcanshare=:fgcanshare')
->andWhere('g=ug.group')
->andWhere('ug.user=:user')
->andWhere('g MEMBER OF calendar.groups')
->andWhere('calendar.user != :user')
->andWhere('calendar.user is not null')
- ->andWhere('proprio.user=calendar.user')
- ->andWhere('proprio.group=g')
->setParameter('fgcanshare',true)
->setParameter('user',$user)
->addOrderBy('calendar.name', 'ASC')
->getQuery()->getResult();
}
+ */
// Initialisation du calcul des calendars
@@ -85,7 +84,8 @@ class CalendarRepository extends EntityRepository
foreach($roles as $role) {
$qb = $this->createQueryBuilder("calendar");
$qb ->where($qb->expr()->like('calendar.roles', $qb->expr()->literal("%$role%")))
- ->andWhere("calendar.user is null");
+ ->andWhere("calendar.user != :user or calendar.user is null")
+ ->setParameter('user',$user);
$calendarsroles=$qb->getQuery()->getResult();
foreach($calendarsroles as $calendarrole) {
@@ -97,7 +97,8 @@ class CalendarRepository extends EntityRepository
foreach($groups as $group) {
$qb = $this->createQueryBuilder("calendar");
$qb ->where(":group MEMBER OF calendar.groups")
- ->andWhere("calendar.user is null")
+ ->andWhere("calendar.user != :user or calendar.user is null")
+ ->setParameter('user',$user)
->setParameter("group",$group->getGroup());
$calendarsgroups=$qb->getQuery()->getResult();
@@ -142,8 +143,6 @@ class CalendarRepository extends EntityRepository
foreach($groups as $group) {
$qb = $this->createQueryBuilder("calendar");
$qb ->where(":group MEMBER OF calendar.groups")
- ->andWhere("calendar.id=:id")
- ->andWhere("calendar.user is null")
->andWhere("calendar.id=:id")
->setParameter("id",$calendar->getId())
->setParameter("group",$group->getGroup());
@@ -173,7 +172,7 @@ class CalendarRepository extends EntityRepository
->from('CadolesCoreBundle:UserGroup','usergroup')
->andwhere('usergroup.group MEMBER OF calendar.groups')
- ->andwhere('usergroup.user=:user')
+ ->andwhere('usergroup.user=user')
->andwhere('usergroup.fgmanager=:flag')
->from('CadolesCoreBundle:Group','groupe')
@@ -186,7 +185,8 @@ class CalendarRepository extends EntityRepository
$inblogwriters=$qb->getQuery()->getResult();
- if($inblogwriters) $canadd=true;
+
+ if($inblogwriters) $canadd=true;
}
return $canadd;
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/PageRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/PageRepository.php
index ea9cc436..d37f2016 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/PageRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/PageRepository.php
@@ -326,12 +326,12 @@ class PageRepository extends EntityRepository
$qb = $this->createQueryBuilder("page");
$qb ->where(":group MEMBER OF page.groups")
->andWhere("page.id=:id")
- ->andWhere("page.user is null")
->andWhere("page.id=:id")
->setParameter("id",$page->getId())
->setParameter("group",$group->getGroup());
$inpagegroup=$qb->getQuery()->getResult();
+
if($inpagegroup) {
$cansee=true;
// Est-il manager du groupe
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
index f368f2a8..a230a52e 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/list.html.twig
@@ -113,6 +113,12 @@
+
+
+ Animateur de Groupe
+
+
+
Modérateur
@@ -191,6 +197,7 @@
$( function() {
$("a[data-role='ROLE_ANONYME']").children("span").html($('.role-ROLE_ANONYME').length);
$("a[data-role='ROLE_USER']").children("span").html($('.role-ROLE_USER').length);
+ $("a[data-role='ROLE_ANIM']").children("span").html($('.role-ROLE_ANIM').length);
$("a[data-role='ROLE_MODO']").children("span").html($('.role-ROLE_MODO').length);
$("a[data-role='ROLE_ADMIN']").children("span").html($('.role-ROLE_ADMIN').length);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/list.html.twig
index 724516a4..ace8de32 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/list.html.twig
@@ -67,6 +67,12 @@
+
+
+ Animateur de Groupe
+
+
+
Modérateur
@@ -115,6 +121,7 @@
$("a[data-role='ROLE_ANONYME']").children("span").html($('.role-ROLE_ANONYME').length);
$("a[data-role='ROLE_USER']").children("span").html($('.role-ROLE_USER').length);
+ $("a[data-role='ROLE_ANIM']").children("span").html($('.role-ROLE_ANIM').length);
$("a[data-role='ROLE_MODO']").children("span").html($('.role-ROLE_MODO').length);
$("a[data-role='ROLE_ADMIN']").children("span").html($('.role-ROLE_ADMIN').length);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
index 90ec24db..6f163631 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig
@@ -85,6 +85,12 @@
+
+
+ Animateur de Groupe
+
+
+
Modérateur
@@ -138,6 +144,7 @@
$("a[data-role='ROLE_ANONYME']").children("span").html($('.group-ROLE_ANONYME').length);
$("a[data-role='ROLE_USER']").children("span").html($('.group-ROLE_USER').length);
+ $("a[data-role='ROLE_ANIM']").children("span").html($('.group-ROLE_ANIM').length);
$("a[data-role='ROLE_MODO']").children("span").html($('.group-ROLE_MODO').length);
$("a[data-role='ROLE_ADMIN']").children("span").html($('.group-ROLE_ADMIN').length);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/list.html.twig
index b049d35a..34b19635 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/list.html.twig
@@ -67,6 +67,12 @@
+
+
+ Animateur de Groupe
+
+
+
Modérateur
@@ -115,6 +121,7 @@
$("a[data-role='ROLE_ANONYME']").children("span").html($('.role-ROLE_ANONYME').length);
$("a[data-role='ROLE_USER']").children("span").html($('.role-ROLE_USER').length);
+ $("a[data-role='ROLE_ANIM']").children("span").html($('.role-ROLE_ANIM').length);
$("a[data-role='ROLE_MODO']").children("span").html($('.role-ROLE_MODO').length);
$("a[data-role='ROLE_ADMIN']").children("span").html($('.role-ROLE_ADMIN').length);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index 27ade853..23d8fd25 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -270,52 +270,41 @@
});
// Init socket de counter
- var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}";
- var _WS_URI = "wss://{{ gos_web_socket_server_host }}:5555";
+ {% if websocket_activate %}
+ var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}";
- var webSocket = WS.connect(_WS_URI);
- var globalsession;
+ var webSocket = WS.connect(_WS_URI);
- webSocket.on("socket/connect", function (session) {
- globalsession=session;
- session.call("websocket/rpc/update_connection_data", {"userid": "{{app.user.id}}" }).then(
- function (result)
- {
- //console.log("RPC Valid!", result);
- },
- function (error, desc)
- {
- //console.log("RPC Error", error, desc);
- }
- );
-
- // The callback function in "subscribe" is called everytime an event is published in that channel.
- session.subscribe("websocket/counter", function (uri, payload) {
- if(payload.log) {
- console.log("Received message", payload.log);
- }
- if(payload.alert) {
- alert(payload.alert);
- }
- if(payload.from!={{app.user.id}}) {
- menu=$("a[data-group='"+payload.group+"']");
- if(menu.length) {
- if(payload.add) {
- console.log("Ajout counter pour group "+payload.group+" by "+payload.from);
- if(menu.children(".badge").length) {
- menu.children(".badge").html(+(menu.children(".badge").html())+1);
+ webSocket.on("socket/connect", function (session) {
+ // The callback function in "subscribe" is called everytime an event is published in that channel.
+ session.subscribe("websocket/counter", function (uri, payload) {
+ if(payload.log) {
+ console.log("Received message", payload.log);
+ }
+ if(payload.alert) {
+ alert(payload.alert);
+ }
+ if(payload.from!={{app.user.id}}) {
+ menu=$("a[data-group='"+payload.group+"']");
+ if(menu.length) {
+ if(payload.add) {
+ console.log("Ajout counter pour group "+payload.group+" by "+payload.from);
+ if(menu.children(".badge").length) {
+ menu.children(".badge").html(+(menu.children(".badge").html())+1);
+ }
+ else menu.append("11
- {% for user in members %}
+ {% for member in members %}
@@ -152,8 +156,8 @@ {% for group in user.groups %}
-
- 
-
-
-
- {{ user.lastname }} {{ user.firstname }}
+
+
+
{% endfor %}
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/config/services.yml b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/config/services.yml
index afd6cf98..e90421bd 100644
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/config/services.yml
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/config/services.yml
@@ -1,4 +1,9 @@
services:
+ cadoles.websocket.pushmessage:
+ public: true
+ class: Cadoles\WebsocketBundle\Service\messageService
+ arguments: ['@service_container','@doctrine.orm.entity_manager','%websocket_activate%']
+
cadoles.websocket.topic:
class: Cadoles\WebsocketBundle\Topic\WebsocketTopic
arguments: ['@gos_web_socket.websocket.client_manipulator','@doctrine.orm.entity_manager','@service_container']
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
index c3731080..681c7831 100644
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
@@ -79,25 +79,12 @@
var dateoptions = {weekday: "long", year: "numeric", month: "long", day: "numeric", hour: "2-digit", minute: "2-digit" };
- {% if app.user %}
+ {% if websocket_activate and app.user %}
var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}";
- var _WS_URI = "wss://{{ gos_web_socket_server_host }}:5555";
var webSocket = WS.connect(_WS_URI);
- webSocket.on("socket/connect", function (session) {
-
- session.call("websocket/rpc/update_connection_data", {"userkey": "{{userkey}}" }).then(
- function (result)
- {
- //console.log("RPC Valid!", result);
- },
- function (error, desc)
- {
- //console.log("RPC Error", error, desc);
- }
- );
-
+ webSocket.on("socket/connect", function (session) {
//the callback function in "subscribe" is called everytime an event is published in that channel.
session.subscribe("websocket/channel/{{groupid}}", function (uri, payload) {
if(payload.msg) {
@@ -134,7 +121,7 @@
$( "#sendbtn" ).click(function() {
var data = CKEDITOR.instances["chat_message"].getData();
if(data) {
- event={type: "add", message: data};
+ event={mykey: "{{userkey}}", type: "add", message: data};
session.publish("websocket/channel/{{groupid}}", event);
CKEDITOR.instances["chat_message"].setData('');
@@ -145,7 +132,7 @@
$(document).on('click', '.delmessage', function(){
id=$(this).data("id");
- event={type: "del", id: id};
+ event={mykey: "{{userkey}}", type: "del", id: id};
session.publish("websocket/channel/{{groupid}}", event);
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Service/messageService.php b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Service/messageService.php
new file mode 100644
index 00000000..0ca4c6b3
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Service/messageService.php
@@ -0,0 +1,27 @@
+container = $container;
+ $this->em = $em;
+ $this->activate_websocket = $activate_websocket;
+ }
+
+ public function send($key,$userid,$groupid,$message) {
+ $pusher = $this->container->get('gos_web_socket.wamp.pusher');
+ $pusher->push(['mykey' => $key, 'type' => 'add', 'message' => $message], 'websocket_topic', ['group' => $groupid]);
+ $pusher->push(['userid' => $userid, 'type' => 'add', 'group' => $groupid], 'websocket_counter');
+ }
+}
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketCounter.php b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketCounter.php
index 5cb07ff4..7b4b8e59 100644
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketCounter.php
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketCounter.php
@@ -70,7 +70,8 @@ class WebsocketCounter implements TopicInterface
*/
public function onPublish(ConnectionInterface $connection, Topic $topic, WampRequest $request, $event, array $exclude, array $eligible)
{
- $userid=$connection->userid;
+ if(!is_array($event)) $event=json_decode($event, true);
+ $userid=$event["userid"];
$user=$this->em->getRepository("CadolesCoreBundle:User")->find($userid);
if(!$user)
@@ -80,13 +81,13 @@ class WebsocketCounter implements TopicInterface
if(!$group)
return;
+ /*
$usergroup=$this->em->getRepository("CadolesCoreBundle:UserGroup")->findOneBy(["user"=>$user,"group"=>$group]);
if(!$usergroup)
return;
-
+ */
+
$topic->broadcast([$event["type"] => 1, "group" => $event["group"] , "from" =>$userid]);
-
-
}
/**
diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketTopic.php b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketTopic.php
index f7756de7..0076fa01 100644
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketTopic.php
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Topic/WebsocketTopic.php
@@ -69,17 +69,18 @@ class WebsocketTopic implements TopicInterface
*/
public function onPublish(ConnectionInterface $connection, Topic $topic, WampRequest $request, $event, array $exclude, array $eligible)
{
- $userkey=$connection->userkey;
$groupid=$request->getAttributes()->get('group');
+ if(!is_array($event)) $event=json_decode($event, true);
$group=$this->em->getRepository("CadolesCoreBundle:Group")->find($groupid);
if(!$group) {
$topic->broadcast(['log' => 'group NOT FIND']);
}
- $usergroup=$this->em->getRepository("CadolesCoreBundle:UserGroup")->findOneBy(['keyvalue'=> $userkey]);
+ $usergroup=$this->em->getRepository("CadolesCoreBundle:UserGroup")->findOneBy(['keyvalue'=>$event["mykey"]]);
if(!$usergroup) {
- $topic->broadcast(['log' => 'user NOT IN GROUP']);
+ $topic->broadcast(['log' => $event]);
+ $topic->broadcast(['log' => 'user '.$event["mykey"].' NOT IN GROUP '.$groupid]);
}
else {
$user=$usergroup->getUser();
diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml
index 846ba35f..9e470262 100644
--- a/tmpl/ninegate-template.yml
+++ b/tmpl/ninegate-template.yml
@@ -38,10 +38,14 @@ parameters:
%end if
%if %%getVar("ninegate_activate_websocket", 'non') == "oui"
websocket_activate: true
- websocket_port: 5555
+ websocket_host: %%ninegate_websocket_url
+ websocket_port: %%ninegate_websocket_portexterne
+ websocket_portinterne: %%ninegate_websocket_portinterne
%else
websocket_activate: false
- websocket_port: 5555
+ websocket_host:
+ websocket_port:
+ websocket_portinterne:
%end if
%if %%getVar("ninegate_activate_portal", 'non') == "oui"
portal_activate: true
+ 
+
+
+
+
+ {%if member.fgmanager%}{%endif%}
+ {{ member.user.lastname }} {{ member.user.firstname }} + +
+ {{ member.user.lastname }} {{ member.user.firstname }} + +