diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php index 891125af..8cdaf304 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php @@ -54,42 +54,43 @@ class CountMessageCommand extends Command foreach($user->getGroups() as $usergroup) { // On calcule le nombre de message non lu pour l'utilisateur' $group=$usergroup->getGroup(); - $qb = $this->em->createQueryBuilder(); - $tm = $qb ->select($qb->expr()->count('m.id')) - ->from('CadolesWebsocketBundle:Message', 'm') - ->where('m.group = :group') - ->andWhere('m.user != :user') - ->setParameter('group', $group) - ->setParameter('user', $user) - ->getQuery()->getSingleScalarResult(); + if($group->getFgcanshare()) { + $qb = $this->em->createQueryBuilder(); + $tm = $qb ->select($qb->expr()->count('m.id')) + ->from('CadolesWebsocketBundle:Message', 'm') + ->where('m.group = :group') + ->andWhere('m.user != :user') + ->setParameter('group', $group) + ->setParameter('user', $user) + ->getQuery()->getSingleScalarResult(); - $qb = $this->em->createQueryBuilder(); - $tr = $qb ->select($qb->expr()->count('m.id')) - ->from('CadolesWebsocketBundle:Message', 'm') - ->where('m.group = :group') - ->andWhere('m.user != :user') - ->andWhere(':user MEMBER OF m.readers') - ->setParameter('group', $group) - ->setParameter('user', $user) - ->getQuery()->getSingleScalarResult(); + $qb = $this->em->createQueryBuilder(); + $tr = $qb ->select($qb->expr()->count('m.id')) + ->from('CadolesWebsocketBundle:Message', 'm') + ->where('m.group = :group') + ->andWhere('m.user != :user') + ->andWhere(':user MEMBER OF m.readers') + ->setParameter('group', $group) + ->setParameter('user', $user) + ->getQuery()->getSingleScalarResult(); - if($tm-$tr>0) $cptnotread+=($tm-$tr); + if($tm-$tr>0) $cptnotread+=($tm-$tr); + } + if($cptnotread>0) { + $this->writeln($user->getUsername()." notifié de ".$cptnotread." messages non lus"); + + $template="template"; + + $mail_params=array( + "subject" => $this->appname." : Messages non lus", + "body_html"=>"

Vous avez ".$cptnotread." messages non lus sur ".$this->appname."

Vous pouvez les consulter sur ".$this->url."

", + "body_text"=>"Vous avez ".$cptnotread." messages non lus sur ".$this->appname."\nVous pouvez les consulter sur ".$this->url, + ); + + $message = $this->container->get('cadoles.core.service.mail'); + $message->sendEmail($template, $mail_params, $user->getEmail(), $this->noreply, $this->appname); + } } - if($cptnotread>0) { - $this->writeln($user->getUsername()." notifié de ".$cptnotread." messages non lus"); - - $template="template"; - - $mail_params=array( - "subject" => $this->appname." : Messages non lus", - "body_html"=>"

Vous avez ".$cptnotread." messages non lus sur ".$this->appname."

Vous pouvez les consulter sur ".$this->url."

", - "body_text"=>"Vous avez ".$cptnotread." messages non lus sur ".$this->appname."\nVous pouvez les consulter sur ".$this->url, - ); - - $message = $this->container->get('cadoles.core.service.mail'); - $message->sendEmail($template, $mail_params, $user->getEmail(), $this->noreply, $this->appname); - } - } $this->writeln(''); return 1;