diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml index bbbadf4e..f117ee22 100644 --- a/dicos/90_ninegate.xml +++ b/dicos/90_ninegate.xml @@ -149,7 +149,7 @@ non - + @@ -352,6 +352,7 @@ ninegate_widlimesurvey_syncenvole ninegate_widmoodle_syncenvole + ninegate_widpiwik_syncenvole ninegate_widwordpress_syncenvole @@ -485,6 +486,7 @@ non ninegate_widpiwik_url + ninegate_widpiwik_syncenvole @@ -494,6 +496,13 @@ None + + oui + activer_piwik + /posh-profil + None + + 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 4476f3e9..863f57d2 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}vVFWm4leqk5s1yL2v3YhSABW45sQmnWx +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}QGvYXVU6ChpCKv9oPx0P6nHMgnlHAwBK ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); @@ -52,6 +52,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f (3001, 3000, 3001, 'Délégation', 'cadoles_portal_config_syncdelegation', 'fa-balance-scale', 'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'), (3120, 3000, 3120, 'Limesurvey', 'cadoles_portal_config_synclimesurvey', 'fa-question', 'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'), (3130, 3000, 3130, 'Moodle', 'cadoles_portal_config_syncmoodle', 'fa-graduation-cap', 'ROLE_ADMIN,ROLE_MODO', 'activate_widmoodle'), +(3160, 3000, 3160, 'Piwik', 'cadoles_portal_config_syncpiwik', 'fa-poll', 'ROLE_ADMIN,ROLE_MODO', 'activate_widpiwik'), (3230, 3000, 3230, 'Wordpress', 'cadoles_portal_config_syncwordpress', 'fa-wordpress', 'ROLE_ADMIN,ROLE_MODO', 'activate_widwordpress'), (7000, NULL, 7000, 'CRON', NULL, 'fa-bolt', 'ROLE_ADMIN,ROLE_MODO', 'cron_activate'), diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php index f9efb42a..bbbceeab 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php @@ -82,6 +82,7 @@ $app["syncenvole_activate"] =$this->container->getParameter('syncenvole_activate'); $app["activate_widlimesurvey"] =$this->container->getParameter('activate_widlimesurvey'); $app["activate_widmoodle"] =$this->container->getParameter('activate_widmoodle'); + $app["activate_widpiwik"] =$this->container->getParameter('activate_widpiwik'); $app["activate_widwordpress"] =$this->container->getParameter('activate_widwordpress'); // Masteridentity diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php index 21353599..890f8674 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php @@ -53,6 +53,20 @@ class SyncenvoleController extends Controller ]); } + public function piwikAction() + { + $url=$this->getParameter("widpiwik_syncenvole"); + $color=$this->get('session')->get('colormain'); + $themename=$this->get('session')->get("theme"); + + return $this->render('CadolesPortalBundle:Tool:frame.html.twig', [ + 'useheader' => true, + 'usemenu' => false, + 'usesidebar' => true, + 'url' => $url."/synchro.php?app=piwik&color=#color#" + ]); + } + public function wordpressAction() { $url=$this->getParameter("widwordpress_syncenvole"); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml index 129bcd6a..1edc009d 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml @@ -13,6 +13,10 @@ cadoles_portal_config_syncmoodle: path: /config/syncenvole/moodle defaults: { _controller: CadolesPortalBundle:Syncenvole:moodle } +cadoles_portal_config_syncpiwik: + path: /config/syncenvole/piwik + defaults: { _controller: CadolesPortalBundle:Syncenvole:piwik } + cadoles_portal_config_syncwordpress: path: /config/syncenvole/wordpress defaults: { _controller: CadolesPortalBundle:Syncenvole:wordpress } diff --git a/tmpl/ninegate-init-01.sql b/tmpl/ninegate-init-01.sql index 5a4ca9c2..a93b55dd 100644 --- a/tmpl/ninegate-init-01.sql +++ b/tmpl/ninegate-init-01.sql @@ -63,6 +63,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f (3001, 3000, 3001, 'Délégation', 'cadoles_portal_config_syncdelegation', 'fa-balance-scale', 'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'), (3120, 3000, 3120, 'Limesurvey', 'cadoles_portal_config_synclimesurvey', 'fa-question', 'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'), (3130, 3000, 3130, 'Moodle', 'cadoles_portal_config_syncmoodle', 'fa-graduation-cap', 'ROLE_ADMIN,ROLE_MODO', 'activate_widmoodle'), +(3160, 3000, 3160, 'Piwik', 'cadoles_portal_config_syncpiwik', 'fa-signal', 'ROLE_ADMIN,ROLE_MODO', 'activate_widpiwik'), (3230, 3000, 3230, 'Wordpress', 'cadoles_portal_config_syncwordpress', 'fa-wordpress', 'ROLE_ADMIN,ROLE_MODO', 'activate_widwordpress'), (7000, NULL, 7000, 'CRON', NULL, 'fa-bolt', 'ROLE_ADMIN,ROLE_MODO', 'cron_activate'), diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml index f216b698..8e868d1d 100644 --- a/tmpl/ninegate-template.yml +++ b/tmpl/ninegate-template.yml @@ -194,6 +194,7 @@ parameters: %if %%getVar("ninegate_activate_widpiwik", 'non') == "oui" activate_widpiwik: true widpiwik_url: %%ninegate_widpiwik_url + widpiwik_syncenvole: %%ninegate_widpiwik_syncenvole %else activate_widpiwik: false %end if