From 8c9bd2f8b03976c35546a0e69f71a1633db8b296 Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 17 Dec 2019 10:47:09 +0100 Subject: [PATCH 1/4] =?UTF-8?q?autoriser=20plus=20de=20caract=C3=A8res=20d?= =?UTF-8?q?ans=20le=20nom=20des=20groupes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php | 1 - .../src/Cadoles/CoreBundle/Command/data/core-init-01.sql | 2 +- .../src/Cadoles/CoreBundle/Controller/GroupController.php | 2 +- .../src/Cadoles/CoreBundle/Controller/Niveau01Controller.php | 2 +- .../src/Cadoles/CoreBundle/Controller/Niveau02Controller.php | 2 +- .../src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig | 2 +- .../Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig | 2 +- .../Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php index e561679b..4bf94b89 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php @@ -108,7 +108,6 @@ class OnlyCommand extends Command $this->writeln($this->only_url); $this->writeln($this->only_host); $this->writeln($this->only_user); - $this->writeln($this->only_password); if($this->only_sync) { // Only Office est-il dans le domaine 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 9dd73405..7cb69baf 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}XeJxoO2l4dkHFX78WQ1Ik30sjLt3kffh +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}iEIczoPGRG4AD3gT80NOruss2uA94dV9 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 7dbc9c04..dc4c379d 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -1025,7 +1025,7 @@ class GroupController extends Controller if($tmp) $form->addError(new FormError('Un niveau de rang 02 utilise déjà ce label')); // On s'assure que le label ne contient pas des caractères speciaux - $string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel()); + $string = preg_replace('~[^ éèêôöàïî\'@a-zA-Z0-9._-]~', '', $data->getLabel()); if($string!=$data->getLabel()) { $form->addError(new FormError('Caractères interdit dans ce label')); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php index 14701547..d33cf22c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau01Controller.php @@ -284,7 +284,7 @@ class Niveau01Controller extends Controller if($tmp) $form->addError(new FormError('Un niveau de rang 02 utilise déjà ce label')); // On s'assure que le label ne contient pas des caractères speciaux - $string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel()); + $string = preg_replace('~[^ éèêôöàïî\'@a-zA-Z0-9._-]~', '', $data->getLabel()); if($string!=$data->getLabel()) { $form->addError(new FormError('Caractères interdit dans ce label')); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php index 27366b37..a64c1b4a 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/Niveau02Controller.php @@ -269,7 +269,7 @@ class Niveau02Controller extends Controller if($tmp) $form->addError(new FormError('Un niveau de rang 01 utilise déjà ce label')); // On s'assure que le label ne contient pas des caractères speciaux - $string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel()); + $string = preg_replace('~[^ éèêôöàïî\'@a-zA-Z0-9._-]~', '', $data->getLabel()); if($string!=$data->getLabel()) { $form->addError(new FormError('Caractères interdit dans ce label')); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig index ef997617..e6144d3f 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig @@ -46,7 +46,7 @@ {% if form.label is defined %} {{ form_row(form.label) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{% if form.fgassoc is defined %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig index 6312241d..b7799e5b 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig @@ -41,7 +41,7 @@
{{ form_row(form.label) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{{ form_row(form.siren) }} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig index e6d973a6..89e31b0a 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig @@ -42,7 +42,7 @@ {{ form_row(form.niveau01) }} {{ form_row(form.label) }}
- Caractères interdits = accent, caractères spéciaux sauf @ . - _
+ Caractères interdits = caractères spéciaux sauf ' @ . - _
{{ form_row(form.siret) }} From e124f3617d3a9634ef3ca7c7050422b037a9c735 Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 17 Dec 2019 11:14:49 +0100 Subject: [PATCH 2/4] ajout item fluxbb (fixes #66) --- dicos/90_ninegate.xml | 33 ++++++++++++++++++ .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../PortalBundle/Command/InitDataCommand.php | 23 ++++++++++++ .../web/uploads/icon/icon_fluxbb.png | Bin 0 -> 6425 bytes tmpl/ninegate-template.yml | 7 ++++ 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_fluxbb.png diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml index 80cb3a67..7b235ac7 100644 --- a/dicos/90_ninegate.xml +++ b/dicos/90_ninegate.xml @@ -31,6 +31,7 @@ + @@ -173,6 +174,12 @@ + + + non + + + non @@ -314,6 +321,7 @@ Paramètres associés à Dokuwiki Paramètres associés à eConnect Paramètres associés à Etherhome + Paramètres associés à Fluxbb Paramètres associés à GEPI Paramètres associés à Grr Paramètres associés à Kanboard @@ -471,6 +479,7 @@ ninegate_activate_widdokuwiki ninegate_activate_wideconnect ninegate_activate_widetherhome + ninegate_activate_widfluxbb ninegate_activate_widgepi ninegate_activate_widgrr ninegate_activate_widkanboard @@ -674,6 +683,30 @@ + + + oui + activer_fluxbb + oui + non + non + + + + non + + ninegate_widfluxbb_url + + + + oui + activer_fluxbb + /fluxbb + None + + + + oui 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 7cb69baf..fdebccb3 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}iEIczoPGRG4AD3gT80NOruss2uA94dV9 +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}hTAPycxp8kXFhZIjteFA4fsB2CQcIenW ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php index 5b4fd08b..216cdd32 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -43,6 +43,7 @@ class InitDataCommand extends ContainerAwareCommand $activate_widdokuwiki = $this->getContainer()->getParameter('activate_widdokuwiki'); $activate_wideconnect = $this->getContainer()->getParameter('activate_wideconnect'); $activate_widetherhome = $this->getContainer()->getParameter('activate_widetherhome'); + $activate_widfluxbb = $this->getContainer()->getParameter('activate_widfluxbb'); $activate_widgepi = $this->getContainer()->getParameter('activate_widgepi'); $activate_widgrr = $this->getContainer()->getParameter('activate_widgrr'); $activate_widkanboard = $this->getContainer()->getParameter('activate_widkanboard'); @@ -354,6 +355,28 @@ class InitDataCommand extends ContainerAwareCommand $em->persist($entityItem); } + // Item fluxbb + if($activate_widfluxbb) { + $widfluxbb_url =$this->getContainer()->getParameter('widfluxbb_url'); + $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-397); + if(!$entityItem) { + $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_fluxbb.png"]); + + $entityItem = new Item(); + $entityItem->setId(-397); + $entityItem->setRowOrder(0); + $entityItem->setTitle('Fluxbb'); + $entityItem->SetSubtitle("Forum"); + $entityItem->setIcon($entityicon); + $entityItem->setTarget("_blank"); + $entityItem->setItemcategory($entityItemcategoryapp); + $entityItem->setEssential(true); + $entityItem->addGroup($groupall); + } + $entityItem->setUrl($widfluxbb_url); + $em->persist($entityItem); + } + // Item gepi if($activate_widgepi) { $widgepi_url =$this->getContainer()->getParameter('widgepi_url'); diff --git a/src/ninegate-1.0/web/uploads/icon/icon_fluxbb.png b/src/ninegate-1.0/web/uploads/icon/icon_fluxbb.png new file mode 100644 index 0000000000000000000000000000000000000000..ff9d8c281c6731851b00b530afc2cdbf75680cdb GIT binary patch literal 6425 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 literal 0 HcmV?d00001 diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml index 86b4a5ed..d51bb12b 100644 --- a/tmpl/ninegate-template.yml +++ b/tmpl/ninegate-template.yml @@ -220,6 +220,13 @@ parameters: activate_widetherhome: false %end if +%if %%getVar("ninegate_activate_widfluxbb", 'non') == "oui" + activate_widfluxbb: true + widfluxbb_url: %%ninegate_widfluxbb_url +%else + activate_widfluxbb: false +%end if + %if %%getVar("ninegate_activate_widgepi", 'non') == "oui" activate_widgepi: true widgepi_url: %%ninegate_widgepi_url From 4d7d0fd82be095ece2a84e43c9ab274237bb226b Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 17 Dec 2019 14:56:15 +0100 Subject: [PATCH 3/4] widget only --- .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../PortalBundle/Command/InitDataCommand.php | 51 ++++++- .../Controller/PagewidgetController.php | 36 ++++- .../PortalBundle/Resources/config/routing.yml | 8 ++ .../Resources/config/services.yml | 5 + .../views/Pagewidget/viewonlydoc.html.twig | 117 +++++++++++++++++ .../PortalBundle/Service/onlyService.php | 124 ++++++++++++++++++ .../web/uploads/icon/icon_onlyoffice.png | Bin 0 -> 9820 bytes 8 files changed, 340 insertions(+), 3 deletions(-) create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_onlyoffice.png 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 fdebccb3..949a0a76 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}hTAPycxp8kXFhZIjteFA4fsB2CQcIenW +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}Kvz21GjhkryG4l7EKniMJzVfwDufa+eI ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php index 216cdd32..a4e56586 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php @@ -51,6 +51,7 @@ class InitDataCommand extends ContainerAwareCommand $activate_widmindmaps = $this->getContainer()->getParameter('activate_widmindmaps'); $activate_widmoodle = $this->getContainer()->getParameter('activate_widmoodle'); $activate_widnextcloud = $this->getContainer()->getParameter('activate_widnextcloud'); + $activate_widonlyoffice = $this->getContainer()->getParameter('activate_widonlyoffice'); $activate_widopensondage = $this->getContainer()->getParameter('activate_widopensondage'); $activate_widphpldapadmin = $this->getContainer()->getParameter('activate_widphpldapadmin'); $activate_widpiwik = $this->getContainer()->getParameter('activate_widpiwik'); @@ -58,6 +59,8 @@ class InitDataCommand extends ContainerAwareCommand $activate_widsacoche = $this->getContainer()->getParameter('activate_widsacoche'); $activate_widwordpress = $this->getContainer()->getParameter('activate_widwordpress'); $activate_websocket = $this->getContainer()->getParameter('websocket_activate'); + + $widonlyoffice_sync = $this->getContainer()->getParameter('widonlyoffice_sync'); $output->writeln('PORTAL = Default Data'); @@ -530,7 +533,29 @@ class InitDataCommand extends ContainerAwareCommand $entityItem->setUrl($widnextcloud_url); $em->persist($entityItem); } - + + // Item Onlyoffice + if($activate_widonlyoffice) { + $widonlyoffice_url =$this->getContainer()->getParameter('widonlyoffice_url'); + $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-1000); + if(!$entityItem) { + $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_onlyoffice.png"]); + + $entityItem = new Item(); + $entityItem->setId(-1000); + $entityItem->setRowOrder(0); + $entityItem->setTitle('Onlyoffice'); + $entityItem->SetSubtitle("Application Bureautique"); + $entityItem->setIcon($entityicon); + $entityItem->setTarget("_blank"); + $entityItem->setItemcategory($entityItemcategoryapp); + $entityItem->setEssential(true); + $entityItem->addGroup($groupall); + } + $entityItem->setUrl($widonlyoffice_url); + $em->persist($entityItem); + } + // Item Opensondage if($activate_widopensondage) { $widopensondage_url =$this->getContainer()->getParameter('widopensondage_url'); @@ -1059,6 +1084,30 @@ class InitDataCommand extends ContainerAwareCommand $entityWidget->setParameter($parameter); $em->persist($entityWidget); + // Onlyoffice document + $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1810); + if($widonlyoffice_sync) { + if(!$entityWidget) $entityWidget = new Widget(); + $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_onlyoffice.png"]); + $entityWidget->setId(-1810); + $entityWidget->setRoworder(2); + $entityWidget->setIcon($entityicon); + $entityWidget->setName('Documents Onlyoffice'); + $entityWidget->setDescription("Les documents associés à votre groupe"); + $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_onlydoc"); + $entityWidget->setHeight("630"); + $entityWidget->setAutoajust(true); + $entityWidget->setBorder(false); + $entityWidget->setOpened(true); + $entityWidget->setAccess(["config","group"]); + $parameter = json_decode('{"fields": []}'); + $entityWidget->setParameter($parameter); + $em->persist($entityWidget); + } + elseif($entityWidget) { + $em->remove($entityWidget); + } + // Widget Séparateur $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1600); if(!$entityWidget) $entityWidget = new Widget(); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index 187e21f7..7000cd55 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -2107,7 +2107,41 @@ class PagewidgetController extends Controller 'nbarticle' => $nbarticle, ]); - } + } + + public function viewOnlydocAction(Request $request,$id,$access="config") { + $usage=$request->query->get('usage'); + $group=$request->query->get('group'); + $user=$this->getUser(); + + $em = $this->getDoctrine()->getManager(); + $entity = $em->getRepository($this->labelentity)->find($id); + if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + + // Permissions + if($access=="config") { + $canupdate = true; + } + else { + // On s'assure que l'utilisateur à la permission de voir + $page=$entity->getPage(); + $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); + if(!$cansee) throw $this->createNotFoundException('Permission denied'); + } + $onlyservice = $this->container->get('cadoles.portal.service.only'); + $files=$onlyservice->getDocument($group, $folders, $firstfolder); + + // Render + return $this->render($this->labelentity.':viewonlydoc.html.twig', [ + 'entity' => $entity, + 'canadd' => $canupdate, + 'canupdate' => $canupdate, + 'firstfolder' => $firstfolder, + 'folders' => $folders, + 'files' => $files, + 'access' => $access, + ]); + } } 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 7d56b011..6e2c5af4 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 @@ -795,6 +795,10 @@ cadoles_portal_config_panelwidget_view_groupmessage: path: /config/pagewidget/view/groupmessage/{id} defaults: { _controller: CadolesPortalBundle:Pagewidget:viewgroupmessage, access: config } +cadoles_portal_config_panelwidget_view_onlydoc: + path: /config/pagewidget/view/onlydoc/{id} + defaults: { _controller: CadolesPortalBundle:Pagewidget:viewonlydoc, access: config } + #-- Access user cadoles_portal_user_pagewidget_widget_sumbit: path: /user/pagewidget/submit/{idpage}/{idwidgettype} @@ -904,3 +908,7 @@ cadoles_portal_user_panelwidget_view_groupmessage: path: /pagewidget/view/groupmessage/{id} defaults: { _controller: CadolesPortalBundle:Pagewidget:viewgroupmessage, access: user } +cadoles_portal_user_panelwidget_view_onlydoc: + path: /pagewidget/view/onlydoc/{id} + defaults: { _controller: CadolesPortalBundle:Pagewidget:viewonlydoc, access: user } + diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/services.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/services.yml index 56f25a36..b24f48a7 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/services.yml +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/services.yml @@ -4,3 +4,8 @@ services: arguments: ['@service_container'] tags: - { name: form.type } + + cadoles.portal.service.only: + public: true + class: Cadoles\PortalBundle\Service\onlyService + arguments: ['@service_container','@doctrine.orm.entity_manager'] diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig new file mode 100644 index 00000000..a49bc642 --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig @@ -0,0 +1,117 @@ +{% set theme = app.session.get('theme') %} +{% if theme is not empty %} + {{ include('@Theme/'~theme~'/function.html.twig') }} +{% endif %} + +{% import "@CadolesPortal/Pagewidget/constants.twig" as constants %} + +{% set stylewidget = constants.mystylewidget(entity) %} +{% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %} +{% set stylewidgetheader = constants.mystylewidgetheader(entity) %} +{% set stylewidgetbody = constants.mystylewidgetbody(entity) %} +{% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %} + +{% set color = app.session.get('color') %} + +{% set colorbodyback = entity.colorbodyback %} +{% if colorbodyback is null %} + {% set colorbodyback = color['main'] %} +{% endif %} + + +{% set colorbodyfont = entity.colorbodyfont %} +{% if colorbodyfont is null %} + {% set colorbodyfont = color['fontcolorhover'] %} +{% endif %} + +
+ {% if canupdate or canadd %} +
+ {% if canupdate %} + + + {% endif %} + + {% if canadd %} + + {% endif %} +
+ {% endif %} + + +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ + {% if files|length >= 1 or canupdate %} +
+
+ {% if canupdate %} +
+
+ {% endif %} + + {% for file in files|sort %} + {% if loop.index==1 and not canupdate%} +
+
+ {% endif %} + +
+
+ {% if canadd %} + + + + {% endif %} + + {% if file.minefamily=="text" or file.minefamily=="image" or file.minetype == "application/pdf" %} + + {% else %} + + {% endif %} +
+ + +
+

{{ file.name }}

+
+
+ +
+
+ {% endfor %} + + {% if canadd %} +
+
+
+ +
+

Ajouter un fichier

+
+
+
+
+ {% endif %} +
+
+ {% endif %} +
+ + + diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php new file mode 100644 index 00000000..0558b75a --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php @@ -0,0 +1,124 @@ +container = $container; + $this->em = $em; + + $this->only_activate = $this->container->getParameter('activate_widonlyoffice'); + if($this->only_activate) { + $this->only_activate=$this->container->getParameter('widonlyoffice_sync'); + if($this->only_activate) { + $this->only_url = $this->container->getParameter('widonlyoffice_url')."/api/2.0/"; + $this->only_user = $this->container->getParameter('widonlyoffice_user'); + $this->only_password = $this->container->getParameter('widonlyoffice_password'); + $this->only_host = str_replace("https://","",str_replace("http://","",$this->container->getParameter("widonlyoffice_url"))); + } + } + } + + public function getDocument($idproject,&$folders,&$firstfolder) { + $files=[]; + $folders=[]; + + if($this->only_activate) { + if($this->authOnly()) { + $response = \Unirest\Request::get($this->only_url.'/project/'.$idproject,$this->headers); + if($this->koresponse($response)) return false; + $firstfolder=$response->body->response->projectFolder;; + + $response = \Unirest\Request::get($this->only_url.'/project/'.$idproject.'/files',$this->headers); + if($this->koresponse($response)) return 0; + foreach($response->body->response->files as $fileonly) { + array_push($files,$fileonly); + } + foreach($response->body->response->folders as $folderonly) { + $folders[$folderonly->id]=$folderonly; + $subfolder=$this->scanfolder($folderonly->id,$folders,$this->headers); + foreach($subfolder as $file) { + array_push($files,$file); + } + } + } + } + + return $files; + } + + private function authOnly() { + // Only Office est-il dans le domaine + if(stripos($this->only_url,"/")===0) + $this->only_url="https://".$this->container->getParameter("weburl").$this->only_url; + $indomaine = (stripos($this->only_url,$this->container->getParameter("weburl"))!==false); + + // Si hors domaine on utilise le proxy si proxy il y a + if(!$indomaine) { + $PROXYactivate = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue(); + if($PROXYactivate) { + $PROXYserver = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); + $PROXYport = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); + \Unirest\Request::proxy($PROXYserver, $PROXYport, CURLPROXY_HTTP, true); + } + } + + \Unirest\Request::verifyPeer(false); + \Unirest\Request::verifyHost(false); + \Unirest\Request::timeout(5); + $this->headers = ['Host' => $this->only_host, 'Accept' => 'application/json','Content-Type'=>'application/json','Retry-After'=>'5']; + $query = array('userName' => $this->only_user, 'password' => $this->only_password); + $body = \Unirest\Request\Body::json($query); + + $response = \Unirest\Request::post($this->only_url.'/authentication',$this->headers,$body); + if($this->koresponse($response)) return false; + $token=$response->body->response->token; + $this->headers["Authorization"]=$token; + return true; + } + + private function koresponse($response) { + if($response->code>=Response::HTTP_BAD_REQUEST) { + $this->mydebug("ERREUR ".$response->code); + if(property_exists($response,"body") && property_exists($response->body,"error")) $this->mydebug("ERREUR ".$response->body->error->message);; + return true; + } + + return false; + } + + private function scanfolder($folderid,&$folders,$headers) { + $files=[]; + $response = \Unirest\Request::get($this->only_url.'/files/'.$folderid,$headers); + if($this->koresponse($response)) return 0; + foreach($response->body->response->files as $fileonly) { + array_push($files,$fileonly); + } + foreach($response->body->response->folders as $folderonly) { + $folders['"'.$folderonly->id.'"']=$folderonly; + $subfolder=$this->scanfolder($folderonly->id,$folders,$headers); + foreach($subfolder as $file) { + array_push($files,$file); + } + } + + return $files; + } + +} diff --git a/src/ninegate-1.0/web/uploads/icon/icon_onlyoffice.png b/src/ninegate-1.0/web/uploads/icon/icon_onlyoffice.png new file mode 100644 index 0000000000000000000000000000000000000000..1579862e8a3c5bd3d5c46940746e47d298669db9 GIT binary patch literal 9820 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 Date: Wed, 18 Dec 2019 14:54:21 +0100 Subject: [PATCH 4/4] widget only --- .../CoreBundle/Controller/GroupController.php | 7 ++ .../Controller/PagewidgetController.php | 9 +- .../views/Pagewidget/viewonlydoc.html.twig | 84 +++++++++---------- .../PortalBundle/Service/onlyService.php | 51 +++++++---- 4 files changed, 88 insertions(+), 63 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index dc4c379d..ce6ed4ea 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -501,6 +501,13 @@ class GroupController extends Controller if($group->getFgAll()||$group->getFgtemplate()) throw $this->createNotFoundException('Permission denied'); + $usergroup = $em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(array("user"=>$userid,"group"=>$groupid)); + if($usergroup) { + $response = new Response(json_encode($output)); + $response->headers->set('Content-Type', 'application/json'); + return $response; + } + $key = Uuid::uuid4(); $usergroup=new Usergroup; $user=$em->getRepository("CadolesCoreBundle:User")->find($userid); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index 7000cd55..bdbb6e3f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -2129,15 +2129,18 @@ class PagewidgetController extends Controller if(!$cansee) throw $this->createNotFoundException('Permission denied'); } $onlyservice = $this->container->get('cadoles.portal.service.only'); - $files=$onlyservice->getDocument($group, $folders, $firstfolder); + $files=$onlyservice->getDocument($group, $folders, $firstfolder, $tasks); + $idonly=$em->getRepository("CadolesCoreBundle:Group")->find($group)->getIdOnlyoffice(); // Render return $this->render($this->labelentity.':viewonlydoc.html.twig', [ 'entity' => $entity, - 'canadd' => $canupdate, - 'canupdate' => $canupdate, + 'canadd' => $cansee, + 'canupdate' => $cansee, 'firstfolder' => $firstfolder, 'folders' => $folders, + 'tasks' => $tasks, + 'urlonly' => $this->getParameter("widonlyoffice_url")."/products/projects/projects.aspx?prjID=".$idonly, 'files' => $files, 'access' => $access, ]); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig index a49bc642..ca26c873 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig @@ -33,7 +33,7 @@ {% endif %} {% if canadd %} - + {% endif %}
{% endif %} @@ -51,44 +51,26 @@ {% if files|length >= 1 or canupdate %}
- {% if canupdate %} -
-
- {% endif %} - - {% for file in files|sort %} - {% if loop.index==1 and not canupdate%} -
-
- {% endif %} +
+
+ {% for file in files %}
- {% if canadd %} - - - - {% endif %} + +
+ - {% if file.minefamily=="text" or file.minefamily=="image" or file.minetype == "application/pdf" %} - - {% else %} - - {% endif %} -
- - -
-

{{ file.name }}

-
-
@@ -96,19 +78,37 @@ {% if canadd %}
-
-
-
{% endif %}
+ + {% if not tasks is empty %} +
+

Tâches

+ {% for task in tasks %} +
  • {{ task.title }}
    • + {% if not task.subtasks is empty %} +
      + {% for subtask in task.subtasks %} +
    • {{ subtask.title }}
      • + {% endfor %} +
    + {% endif %} + {% endfor %} +
    + {% endif %}
    {% endif %}
    diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php index 0558b75a..ca9bf072 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Service/onlyService.php @@ -4,6 +4,7 @@ namespace Cadoles\PortalBundle\Service; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Response; use Doctrine\ORM\EntityManager; class onlyService @@ -35,28 +36,38 @@ class onlyService } } - public function getDocument($idproject,&$folders,&$firstfolder) { + public function getDocument($idgroup,&$folders,&$firstfolder,&$tasks) { $files=[]; $folders=[]; + $tasks=[]; - if($this->only_activate) { - if($this->authOnly()) { - $response = \Unirest\Request::get($this->only_url.'/project/'.$idproject,$this->headers); - if($this->koresponse($response)) return false; - $firstfolder=$response->body->response->projectFolder;; - - $response = \Unirest\Request::get($this->only_url.'/project/'.$idproject.'/files',$this->headers); - if($this->koresponse($response)) return 0; - foreach($response->body->response->files as $fileonly) { - array_push($files,$fileonly); - } - foreach($response->body->response->folders as $folderonly) { - $folders[$folderonly->id]=$folderonly; - $subfolder=$this->scanfolder($folderonly->id,$folders,$this->headers); - foreach($subfolder as $file) { - array_push($files,$file); + $group=$this->em->getRepository("CadolesCoreBundle:Group")->find($idgroup); + if($group&&$group->getIdonlyoffice()) { + if($this->only_activate) { + if($this->authOnly()) { + $response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice(),$this->headers); + if(!$this->koresponse($response)) { + $firstfolder=$response->body->response->projectFolder;; + + $response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice().'/files',$this->headers); + if(!$this->koresponse($response)) { + foreach($response->body->response->files as $fileonly) { + array_push($files,$fileonly); + } + foreach($response->body->response->folders as $folderonly) { + $folders[$folderonly->id]=$folderonly; + $subfolder=$this->scanfolder($folderonly->id,$folders,$this->headers); + foreach($subfolder as $file) { + array_push($files,$file); + } + } + + $response = \Unirest\Request::get($this->only_url.'/project/'.$group->getIdonlyoffice().'/task/open',$this->headers); + error_log($this->only_url.'/project/'.$group->getIdonlyoffice().'/tasks/open'); + if(!$this->koresponse($response)) $tasks=$response->body->response; + } } - } + } } } @@ -103,6 +114,10 @@ class onlyService return false; } + private function mydebug($texte) { + if($this->debug) error_log($texte); + } + private function scanfolder($folderid,&$folders,$headers) { $files=[]; $response = \Unirest\Request::get($this->only_url.'/files/'.$folderid,$headers);