Merge branch 'master' into dist/envole/7/master

dicos/90_ninesurvey.xml

@@ -2,6 +2,7 @@
 <creole>
     <files>
         <file filelist='ninesurvey' name='/etc/eole/eole-db.d/ninesurvey-db.yml' rm='True' mkdir='True'/>
+        <file filelist='ninesurvey_nginx' name='/etc/nginx/web.d/ninesurvey.conf' source='ninesurvey-nginx.conf' rm='True' mkdir='True' />   
     </files>
 
 	<containers>
@@ -19,10 +20,11 @@
 	</containers>
 
 	<variables>
-        <family name='ninesurvey'>
+        <family name='ninesurvey' icon='ticket'>
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_revprox" type="oui/non" description="Activer le reverse proxy Nginx" hidden='True' exists='False'><value>non</value></variable>
 
-			<variable name='activer_ninesurvey' type='oui/non' description='Activer ninesurvey'>
+			<variable name='activer_ninesurvey' type='oui/non' description='Activer Ninesurvey'>
 				<value>oui</value>
 			</variable>
 
@@ -52,8 +54,9 @@
             <variable type='string' name='ninesurvey_smtppwd' description='Mot de passe associé du compte SMTP' />
             <variable type='string' name='ninesurvey_smtpencryption' description='Type Encryptage du serveur SMTP' />
             <variable type='string' name='ninesurvey_smtpauthmode' description='Mode Authentification du serveur SMTP' />
+        </family>
 
-
+        <family name='EoleDB' icon='database' mode='expert'>
             <!-- BDD -->
             <variable type='string' name='ninesurvey_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
             <variable type='string' name='ninesurvey_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
@@ -66,7 +69,7 @@
         <separators>
             <separator name="ninesurvey_ldaptemplate">Paramètres associés à l'Annuaire</separator>
             <separator name="ninesurvey_noreply">Paramètres associés aux Mails</separator>
-            <separator name="ninesurvey_db_mode">Paramètres associés à la Base de Données</separator>
+            <separator name="ninesurvey_db_mode">Paramètres EoleDB associés à Ninesurvey</separator>
         </separators> 
 	</variables>
 
@@ -75,9 +78,15 @@
         <condition name='hidden_if_in' source='activer_apache'>
             <param>non</param>
             <target type='filelist'>ninesurvey</target>
+            <target type='filelist'>ninesurvey_nginx</target>
             <target type='servicelist'>ninesurvey</target>
         </condition>
 
+        <!-- AFFICHAGE EN FONCTION DE REVERSE PROXY -->
+        <condition name='hidden_if_in' source='activer_revprox'>
+            <param>non</param>
+            <target type='filelist'>ninesurvey_nginx</target>
+        </condition>
 
         <!-- AFFICHAGE EN FONCTION DE ninesurvey -->
 		<condition name='hidden_if_in' source='activer_ninesurvey'>
@@ -107,6 +116,7 @@
             <target type='variable'>ninesurvey_dbpass</target>
 
 			<target type='filelist'>ninesurvey</target>
+            <target type='filelist'>ninesurvey_nginx</target>
 			<target type='servicelist'>ninesurvey</target>
 		</condition>
 

src/ninesurvey-1.0/assets/js/app.js

@@ -64,4 +64,8 @@ window.CropSelectJs = require('crop-select-js/crop-select-js.min.js');
 require('spectrum-colorpicker2/dist/spectrum.min.js');
 require('spectrum-colorpicker2/dist/spectrum.min.css');
 
+// jquery.flot
+require('jquery.flot/jquery.flot.js');
+require('jquery.flot/jquery.flot.pie.js');
+
 

src/ninesurvey-1.0/composer.json

@@ -8,6 +8,7 @@
         "cboden/ratchet": "^0.4.3",
         "craue/formflow-bundle": "^3.3",
         "doctrine/annotations": "^1.8",
+        "dompdf/dompdf": "^1.1",
         "friendsofsymfony/ckeditor-bundle": "^2.2",
         "friendsofsymfony/rest-bundle": "^3.0",
         "jasig/phpcas": "^1.3",

src/ninesurvey-1.0/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "e2590c5a41dce3868f00073d0a1c9a7c",
+    "content-hash": "d6e7771b1cc92995d2133d770ef6917d",
     "packages": [
         {
             "name": "brick/math",
@@ -1451,6 +1451,69 @@
             ],
             "time": "2020-07-30T16:57:33+00:00"
         },
+        {
+            "name": "dompdf/dompdf",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/dompdf.git",
+                "reference": "de4aad040737a89fae2129cdeb0f79c45513128d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/de4aad040737a89fae2129cdeb0f79c45513128d",
+                "reference": "de4aad040737a89fae2129cdeb0f79c45513128d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "phenx/php-font-lib": "^0.5.2",
+                "phenx/php-svg-lib": "^0.3.3",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8 || ^9",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "suggest": {
+                "ext-gd": "Needed to process images",
+                "ext-gmagick": "Improves image processing performance",
+                "ext-imagick": "Improves image processing performance",
+                "ext-zlib": "Needed for pdf stream compression"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Dompdf\\": "src/"
+                },
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                },
+                {
+                    "name": "Brian Sweeney",
+                    "email": "eclecticgeek@gmail.com"
+                },
+                {
+                    "name": "Gabriel Bull",
+                    "email": "me@gabrielbull.com"
+                }
+            ],
+            "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
+            "homepage": "https://github.com/dompdf/dompdf",
+            "time": "2021-11-24T00:45:04+00:00"
+        },
         {
             "name": "egulias/email-validator",
             "version": "2.1.22",
@@ -2505,6 +2568,83 @@
             ],
             "time": "2020-07-06T14:54:07+00:00"
         },
+        {
+            "name": "phenx/php-font-lib",
+            "version": "0.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PhenX/php-font-lib.git",
+                "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8",
+                "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5 || ^6 || ^7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "FontLib\\": "src/FontLib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                }
+            ],
+            "description": "A library to read, parse, export and make subsets of different types of font files.",
+            "homepage": "https://github.com/PhenX/php-font-lib",
+            "time": "2020-03-08T15:31:32+00:00"
+        },
+        {
+            "name": "phenx/php-svg-lib",
+            "version": "v0.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PhenX/php-svg-lib.git",
+                "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32",
+                "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32",
+                "shasum": ""
+            },
+            "require": {
+                "sabberworm/php-css-parser": "^8.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.5|^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Svg\\": "src/Svg"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                }
+            ],
+            "description": "A library to read, parse and export to PDF SVG files.",
+            "homepage": "https://github.com/PhenX/php-svg-lib",
+            "time": "2019-09-11T20:02:13+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
@@ -3559,6 +3699,51 @@
             ],
             "time": "2020-05-04T10:17:57+00:00"
         },
+        {
+            "name": "sabberworm/php-css-parser",
+            "version": "8.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
+                "reference": "d217848e1396ef962fb1997cf3e2421acba7f796"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796",
+                "reference": "d217848e1396ef962fb1997cf3e2421acba7f796",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "codacy/coverage": "^1.4",
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Sabberworm\\CSS": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Raphael Schweikert"
+                }
+            ],
+            "description": "Parser for CSS Files written in PHP",
+            "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser",
+            "keywords": [
+                "css",
+                "parser",
+                "stylesheet"
+            ],
+            "time": "2020-06-01T09:10:00+00:00"
+        },
         {
             "name": "sensio/framework-extra-bundle",
             "version": "v5.6.1",
@@ -3695,6 +3880,7 @@
                 "mail",
                 "mailer"
             ],
+            "abandoned": "symfony/mailer",
             "time": "2019-11-12T09:31:26+00:00"
         },
         {
@@ -8223,12 +8409,12 @@
             "version": "1.9.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
+                "url": "https://github.com/webmozarts/assert.git",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },

src/ninesurvey-1.0/config/packages/knp_snappy.yaml

@@ -2,9 +2,12 @@ knp_snappy:
     temporary_folder: "%kernel.cache_dir%/snappy"  
     pdf:
         enabled:    true
-        binary:     '/var/www/html/schedule/scripts/wkhtmltopdf/wkhtmltopdf'
-        options:    []
+        binary:     'xvfb-run -- /usr/bin/wkhtmltopdf'
+        options:    
+          enable-javascript: true
+          javascript-delay: 1000
+          no-stop-slow-scripts: true
     image:
         enabled:    true
-        binary:     '/var/www/html/schedule/scripts/wkhtmltopdf/wkhtmltoimage'
+        binary:     '/var/www/html/ninesurvey/scripts/wkhtmltopdf/wkhtmltoimage'
         options:    []

src/ninesurvey-1.0/config/routes.yaml

@@ -213,3 +213,55 @@ app_survey_byloginkey:
     path: /user/survey/byloginkey/{key}
     defaults: { _controller: App\Controller\SurveyController:byloginkey }       
 
+#== Quest 
+app_quest:
+    path: /user/quest
+    defaults: { _controller: App\Controller\QuestController:list }
+
+app_quest_submit:
+    path: /user/quest/submit
+    defaults: { _controller: App\Controller\QuestController:submit }
+
+app_quest_update:
+    path: /user/quest/update/{id}
+    defaults: { _controller: App\Controller\QuestController:update }
+
+app_quest_result:
+    path: /user/quest/result/{id}
+    defaults: { _controller: App\Controller\QuestController:result }
+
+app_quest_delete:
+    path: /user/quest/delete/{id}
+    defaults: { _controller: App\Controller\QuestController:delete }    
+
+app_quest_close:
+    path: /user/quest/close/{id}
+    defaults: { _controller: App\Controller\QuestController:closeopen, status: 1 }       
+
+app_quest_open:
+    path: /user/quest/open/{id}
+    defaults: { _controller: App\Controller\QuestController:closeopen, status: 0 }           
+
+app_quest_byquestkey:
+    path: /quest/byquestkey/{key}
+    defaults: { _controller: App\Controller\QuestController:byquestkey }    
+
+app_quest_byguestkey:
+    path: /quest/byguestkey/{key}
+    defaults: { _controller: App\Controller\QuestController:byguestkey }        
+
+app_quest_byuserkey:
+    path: /user/quest/byuserkey/{key}
+    defaults: { _controller: App\Controller\QuestController:byuserkey }       
+
+app_quest_byloginkey:
+    path: /user/quest/byloginkey/{key}
+    defaults: { _controller: App\Controller\QuestController:byloginkey }       
+
+app_quest_byguestkey_result:
+    path: /quest/result/byguestkey/{key}
+    defaults: { _controller: App\Controller\QuestController:resultbyguestkey }    
+
+app_quest_byuserkey_result:
+    path: /quest/result/byuserkey/{key}
+    defaults: { _controller: App\Controller\QuestController:resultbyuserkey }    

src/ninesurvey-1.0/config/services.yaml

@@ -28,6 +28,7 @@ parameters:
   ldapModel: '%env(resolve:LDAP_MODEL)%'
   ldapHost: '%env(resolve:LDAP_HOST)%'
   ldapPort: '%env(resolve:LDAP_PORT)%'
+  ldapTls: '%env(resolve:LDAP_TLS)%'
   ldapUser: '%env(resolve:LDAP_USER)%'
   ldapPassword: '%env(resolve:LDAP_PASSWORD)%'
   ldapBasedn: '%env(resolve:LDAP_BASEDN)%'
@@ -66,6 +67,7 @@ services:
         bind:
             $ldapHost: '%ldapHost%'
             $ldapPort: '%ldapPort%'
+            $ldapTls: '%ldapTls%'
             $ldapUser: '%ldapUser%'
             $ldapPassword: '%ldapPassword%'
             $ldapBasedn: '%ldapBasedn%'
@@ -105,7 +107,7 @@ services:
     app.ldap.service:
         public: true
         class: App\Service\ldapService
-        arguments: ["%ldapHost%","%ldapPort%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
+        arguments: ["%ldapHost%","%ldapPort%","%ldapTls%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
 
     app.upload.samename:
         public: true

src/ninesurvey-1.0/package.json

@@ -28,6 +28,7 @@
     "encore": "^0.0.30-beta",
     "imagesloaded": "^4.1.4",
     "jquery": "^3.4.1",
+    "jquery.flot": "^0.8.3",
     "jqueryui": "^1.11.1",
     "masonry-layout": "^4.2.2",
     "moment": "^2.24.0",