Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: Cadoles:825947f4aec2bb076c6e1080410066954a371790
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
..
compare: Cadoles:5e7f1ba3c75196c3d4475cb2b3a7997b056e3a45
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

No commits in common. "825947f4aec2bb076c6e1080410066954a371790" and "5e7f1ba3c75196c3d4475cb2b3a7997b056e3a45" have entirely different histories.
825947f4ae ... 5e7f1ba3c7

7 changed files with 7 additions and 95 deletions
Show Stats Expand all files Collapse all files

16
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/ScriptCommand.php
View File

@ -29,7 +29,7 @@ class ScriptCommand extends Command
$this
->setName('Core:Script')
->setDescription('Lauch Script')
->setHelp('Execeute some script : visibletrue / setusersniveau')
->setHelp('Execeute some script : visibletrue / ')
->addArgument('scriptname', InputArgument::OPTIONAL, 'scriptname')
;
}
@ -51,7 +51,6 @@ class ScriptCommand extends Command
switch($scriptname) {
case "visibletrue": $this->visibletrue(); break;
case "setusersniveau": $this->setusersniveau(); break;
}
$this->writeln('');
@ -71,19 +70,6 @@ class ScriptCommand extends Command
}
}
private function setusersniveau() {
$users = $this->em->getRepository('CadolesCoreBundle:User')->findAll();
foreach($users as $user) {
$this->writeln($user->getUsername());
$user->setLabelniveau01($user->getNiveau01()->getLabel());
$user->setLabelniveau02(($user->getNiveau02()?$user->getNiveau02()->getLabel():null));
$this->em->persist($user);
$this->em->flush();
}
}
private function writelnred($string) {
$this->output->writeln('<fg=red>'.$string.'</>');
$this->filesystem->appendToFile($this->rootlog.'cron.log', $string."\n");

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
View File

@ -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}RpichoTKCN2p1e9VPz1JnGxjaZ7Xe1Eq
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}oBuVhAUjam9tCeMBwS0xBsAM2PdHZLW3
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');

59
src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/User.php
View File

@ -92,17 +92,6 @@ class User implements UserInterface, \Serializable
*/
private $siret;
/**
* @ORM\Column(type="string", length=250, nullable=true)
*/
private $labelniveau01;
/**
* @ORM\Column(type="string", length=250, nullable=true)
*/
private $labelniveau02;
/**
* @ORM\Column(type="string", length=60, nullable=true)
*/
@ -640,54 +629,6 @@ class User implements UserInterface, \Serializable
return $this->siret;
}
/**
* Set labelniveau01
*
* @param string $labelniveau01
*
* @return User
*/
public function setLabelniveau01($labelniveau01)
{
$this->labelniveau01 = $labelniveau01;
return $this;
}
/**
* Get labelniveau01
*
* @return string
*/
public function getLabelniveau01()
{
return $this->labelniveau01;
}
/**
* Set labelniveau02
*
* @param string $labelniveau02
*
* @return User
*/
public function setLabelniveau02($labelniveau02)
{
$this->labelniveau02 = $labelniveau02;
return $this;
}
/**
* Get labelniveau02
*
* @return string
*/
public function getLabelniveau02()
{
return $this->labelniveau02;
}
/**
* Set usualname
*

7
src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncNiveau01.php
View File

@ -20,7 +20,6 @@ class syncNiveau01 implements EventSubscriber
$this->em = $em;
$this->shouldSync = true;
$this->changeSiren = true;
$this->changeLabel = true;
}
public function getSubscribedEvents()
@ -42,7 +41,6 @@ class syncNiveau01 implements EventSubscriber
// Synchronisation uniquement si changement de valeur
$this->shouldSync = $args->hasChangedField('label')||$args->hasChangedField('siren');
$this->changeSiren = $args->hasChangedField('siren');
$this->changeLabel = $args->hasChangedField('label');
if($args->hasChangedField('label')) $this->oldid=$args->getOldValue('label');
@ -59,7 +57,7 @@ class syncNiveau01 implements EventSubscriber
}
if ($entity instanceof Niveau01 && ($this->changeSiren||$this->changeLabel)) {
if ($entity instanceof Niveau01 && $this->changeSiren) {
// On change le SIRET de l'ensemble des utlisateurs associés à cet établissement
$qb = $this->em->createQueryBuilder();
$datas= $qb ->select('table')->from('CadolesCoreBundle:User','table')
@ -69,11 +67,10 @@ class syncNiveau01 implements EventSubscriber
->getResult();
foreach($datas as $data) {
$data->setSiren($entity->getSiren());
$data->setLabelniveau01($entity->getLabel());
$this->em->persist($data);
$this->em->flush();
}
}
}
}
public function postPersist(LifecycleEventArgs $args)

5
src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncNiveau02.php
View File

@ -22,7 +22,6 @@ class syncNiveau02 implements EventSubscriber
$this->em = $em;
$this->shouldSync = true;
$this->changeSiret = true;
$this->changeLabel = true;
}
public function getSubscribedEvents()
@ -44,7 +43,6 @@ class syncNiveau02 implements EventSubscriber
// Synchronisation uniquement si changement de valeur
$this->shouldSync = $args->hasChangedField('label')||$args->hasChangedField('siret')||$args->hasChangedField('postaladress');
$this->changeSiret = $args->hasChangedField('siret');
$this->changeLabel = $args->hasChangedField('label');
if($args->hasChangedField('label')) $this->oldid=$args->getOldValue('label');
}
@ -58,7 +56,7 @@ class syncNiveau02 implements EventSubscriber
$this->upsertNiveau02($entity);
}
if ($entity instanceof Niveau02 && ($this->changeSiret||$this->changeLabel)) {
if ($entity instanceof Niveau02 && $this->changeSiret) {
// On change le SIRET de l'ensemble des utlisateurs associés à cet établissement
$qb = $this->em->createQueryBuilder();
$datas= $qb ->select('table')->from('CadolesCoreBundle:User','table')
@ -68,7 +66,6 @@ class syncNiveau02 implements EventSubscriber
->getResult();
foreach($datas as $data) {
$data->setSiret($entity->getSiret());
$data->setLabelniveau02($entity->getLabel());
$this->em->persist($data);
$this->em->flush();
}

11
src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/syncUser.php
View File

@ -53,8 +53,6 @@ class syncUser implements EventSubscriber
$args->hasChangedField('niveau02') ||
$args->hasChangedField('siren') ||
$args->hasChangedField('siret') ||
$args->hasChangedField('labelniveau01') ||
$args->hasChangedField('labelniveau02') ||
$args->hasChangedField('authlevel') ||
$args->hasChangedField('usualname') ||
$args->hasChangedField('telephonenumber') ||
@ -70,15 +68,10 @@ class syncUser implements EventSubscriber
;
$entity->setSiren($entity->getNiveau01()->getSiren());
$entity->setLabelniveau01($entity->getNiveau01()->getLabel());
if($entity->getNiveau02()!==null) {
if($entity->getNiveau02()!==null)
$entity->setSiret($entity->getNiveau02()->getSiret());
$entity->setLabelniveau02($entity->getNiveau02()->getLabel());
}
else {
else
$entity->setSiret(null);
$entity->setLabelniveau02(null);
}
}
public function postUpdate(LifecycleEventArgs $args)

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Service/ldapService.php
View File

@ -270,9 +270,7 @@ class ldapService
$attrs['userPassword'] = $user->getPassword();
$attrs['cn'] = $user->getFirstname() . ' ' . $user->getLastname();
$attrs['siren'] = $user->getNiveau01()->getSiren();
$attrs['niveau01'] = $user->getNiveau01()->getLabel();
$attrs['siret'] = ($user->getNiveau02()!==null?$user->getNiveau02()->getSiret():"");
$attrs['niveau02'] = ($user->getNiveau02()!==null?$user->getNiveau02()->getLabel():"");
$attrs['authlevel'] = $user->getAuthlevel();
$attrs['usualname'] = $user->getUsualname();
$attrs['telephoneNumber'] = $user->getTelephonenumber();