diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 1bd74885..7288f457 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}hQDYGlko/0bZ5TvumkZnJPgwgGF9FfC5 +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}cmleGwso06Qj5cTZ+28U/BFQCTkB0Ur3 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); 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 8cdaf304..8b3d4daf 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Command/CountMessageCommand.php @@ -50,6 +50,7 @@ class CountMessageCommand extends Command $users=$this->em->getRepository("CadolesCoreBundle:User")->findAll(); foreach($users as $user) { $cptnotread=0; + // Pour chaque group de l'utilisateur foreach($user->getGroups() as $usergroup) { // On calcule le nombre de message non lu pour l'utilisateur' @@ -76,21 +77,23 @@ class CountMessageCommand extends Command 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); - } } + + // S'il l'utilisateur a des messages non lus + 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;