From 6d076a529279b454d1b3d91e4b0210ac21413823 Mon Sep 17 00:00:00 2001 From: afornerot Date: Thu, 18 Apr 2019 15:13:54 +0200 Subject: [PATCH] correctif --- .../CoreBundle/Command/SynchroCommand.php | 20 ++++++++++++------ .../CoreBundle/Command/data/core-init-01.sql | 17 ++++++++------- .../views/Pagewidget/viewitem.html.twig | 6 +++--- .../web/uploads/icon/icon_euro.png | Bin 0 -> 30583 bytes tmpl/ninegate-template.yml | 5 +++-- 5 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_euro.png diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php index 6ca78772..44db153c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php @@ -152,8 +152,12 @@ class SynchroCommand extends Command // Création ou Modification du user $user=$this->em->getRepository('CadolesCoreBundle:User')->findBy(array('username' => $result[$ldap_username])); if(!$user) { - $this->writeln(" - Création dans Bundle >> ".$result[$ldap_username]); - if(!$simulate) $this->addUser($data,$result[$ldap_username],$result[$ldap_firstname],$result[$ldap_lastname],$result[$ldap_email],$ldap_usersadmin); + if(empty($result[$ldap_email])) + $this->writelnred(" - Création dans Bundle impossible >> ".$result[$ldap_username]." sans email"); + else { + $this->writeln(" - Création dans Bundle >> ".$result[$ldap_username]); + if(!$simulate) $this->addUser($data,$result[$ldap_username],$result[$ldap_firstname],$result[$ldap_lastname],$result[$ldap_email],$ldap_usersadmin); + } } else { $this->writeln(" - Modification dans Bundle >> ".$result[$ldap_username]); @@ -238,10 +242,14 @@ class SynchroCommand extends Command foreach($users as $user) { // Si l'utilisateur n'est pas dans la liste des users ldap : on le supprime if(!in_array($user->getUsername(),$ldapusers)) { - $this->writeln(" - Suppression dans Bundle >> ".$user->getUsername()); - if(!$simulate) { - $this->em->remove($user); - $this->em->flush(); + if($user->getUsername()=="admin") + $this->writeln(" - Ne jamais supprimer >> ".$user->getUsername()); + else { + $this->writeln(" - Suppression dans Bundle >> ".$user->getUsername()); + if(!$simulate) { + $this->em->remove($user); + $this->em->flush(); + } } } } 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 56dd6982..dda09fa4 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 @@ -5,10 +5,10 @@ SET foreign_key_checks = 0; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES -(-100, 'ldapbundle', '0000000A'); +(-100, 'cadtools', '0000000A'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'ldapbundle', 'PWD_CAS', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '0000000A', 'simple'); +(-100, -100, 'admin', 'Administrateur', 'cadtools', 'PWD_CAS', 'admin@cadtools.cadol.es', 'admin.jpg', 'ROLE_ADMIN', '0000000A', 'simple'); @@ -30,8 +30,9 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f (1530, 1500, 1530, 'Annonces', 'cadoles_portal_config_alert', 'fa-bell', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (1540, 1500, 1540, 'Calendriers', 'cadoles_portal_config_calendar', 'fa-calendar', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (1550, 1500, 1550, 'Blogs', 'cadoles_portal_config_blog', 'fa-paper-plane', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), -(1560, 1500, 1560, 'Chartes', 'cadoles_portal_config_notice', 'fa-info', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), -(1570, 1500, 1570, 'Icônes', 'cadoles_portal_config_icon', 'fa-bug', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1560, 1500, 1560, 'Flux', 'cadoles_portal_config_flux', 'fa-rss', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1570, 1500, 1570, 'Chartes', 'cadoles_portal_config_notice', 'fa-info', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), +(1580, 1500, 1580, 'Icônes', 'cadoles_portal_config_icon', 'fa-bug', 'ROLE_ADMIN,ROLE_MODO', 'portal_activate'), (7000, NULL, 7000, 'CRON', NULL, 'fa-bolt', 'ROLE_ADMIN', 'cron_activate'), @@ -42,7 +43,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f DELETE FROM `config` WHERE `changeable` = 0; INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type`, `id`, `value`, `grouped`, `help`) VALUES -('001', 1, 1, 1, 'string', 'appname', 'Cadoles User', '', 'Le titre de votre site'), +('001', 1, 1, 1, 'string', 'appname', 'Ninegate', '', 'Le titre de votre site'), ('002', 1, 0, 1, 'string', 'version', '1.0.0', '', 'Version de l\'application'), ('003', 1, 1, 0, 'string', 'subappname', 'Portail', '', 'Le sous titre de votre site'), ('004', 1, 1, 1, 'logo', 'logo', 'uploads/logo/logo.png', '', 'Le logo de votre site'), @@ -59,6 +60,6 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type ('060', 1, 1, 1, 'font', 'fontfacetitle', 'Anton-Regular', '', 'Police des titres de votre site'), ('061', 1, 1, 1, 'font', 'fontfacebody', 'Helvetica', '', 'Police des titres de votre site'), -('200', 1, 0, 1, 'boolean', 'PROXYactivate', '1', '', 'Définit un Proxy'), -('201', 1, 0, 1, 'string', 'PROXYserver', '192.168.57.160', 'PROXYactivate','Adresse du Proxy'), -('202', 1, 0, 1, 'string', 'PROXYport', '8080', 'PROXYactivate','Port du Proxy'); +('200', 1, 0, 1, 'boolean', 'PROXYactivate', '0', '', 'Définit un Proxy'), +('201', 1, 0, 1, 'string', 'PROXYserver', '', 'PROXYactivate','Adresse du Proxy'), +('202', 1, 0, 1, 'string', 'PROXYport', '', 'PROXYactivate','Port du Proxy'); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig index 864d6b81..ecadf378 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig @@ -118,11 +118,11 @@ {% endif %} {% if item.protected and not app.user %} - {% if app_login_mode == "SAML" %} + {% if mode_auth == "SAML" %} - {% elseif app_login_mode == "CAS" %} + {% elseif mode_auth == "CAS" %} - {% elseif app_login_mode == "MYSQL" %} + {% elseif mode_auth == "MYSQL" %} {% endif %} diff --git a/src/ninegate-1.0/web/uploads/icon/icon_euro.png b/src/ninegate-1.0/web/uploads/icon/icon_euro.png new file mode 100644 index 0000000000000000000000000000000000000000..60fcaad855461804198f07d6b053d0cb5d89e4e8 GIT binary patch literal 30583 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 CK|zQB literal 0 HcmV?d00001 diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml index 44b95196..62af480f 100644 --- a/tmpl/ninegate-template.yml +++ b/tmpl/ninegate-template.yml @@ -30,10 +30,11 @@ parameters: # Information de base de l'annuaire ldap_host: %%adresse_ip_ldap ldap_port: %%ldap_port +%if %%getVar("activer_admin_passfile", 'non') == "oui" ldap_user: cn=admin,o=gouv,c=fr -%if %%is_defined("ldap_admin_passfile") - ldap_password: %%pwdreader("",%%ldap_admin_passfile) + ldap_password: %%pwdreader("",%%ldap_admin_passfile) %else + ldap_user: cn=reader,o=gouv,c=fr ldap_password: %%pwdreader("",%%ldap_reader_passfile) %end if ldap_basedn: o=gouv,c=fr