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

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: eole-ninegate
+Section: web
+Priority: optional
+Maintainer: Equipe Envole <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4
+Homepage: http://eole.orion.education.fr/diff/
+Vcs-Git: http://dev-eole.ac-dijon.fr/git/ninegate
+Vcs-Browser: http://dev-eole.ac-dijon.fr/projects/ninegate/repository
+
+Package: ninegate-sso
+Architecture: all
+Depends: ${misc:Depends}, eole-sso
+Description: Filtre SSO pour ninegate "EOLE".
+
+Package: eole-ninegate
+Architecture: all
+Depends: ${misc:Depends}, eole-web (>= 2.6.1), ninegate-sso, eole-envole-dependances
+Description: Eolisation de l'application ninegate.
+
+Package: ninegate-apps
+Architecture: all
+Depends: ${misc:Depends}, eole-web-pkg (>= 2.6.1), envole-dependances-apps
+Description: Sources pour ninegate "EOLE".

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-ninegate.install

@@ -0,0 +1 @@
+usr/share/eole

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/envole/%(version)s

debian/ninegate-apps.install

@@ -0,0 +1,2 @@
+var/www/html
+etc

debian/ninegate-sso.install

@@ -0,0 +1 @@
+usr/share/sso

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/91_ninegate.xml

@@ -2,7 +2,6 @@
 <creole>
     <files>
         <file filelist='ninegate' name='/etc/eole/eole-db.d/ninegate-db.yml' rm='True' mkdir='True'/>
-        <file filelist='ninegate_nginx' name='/etc/nginx/web.d/ninegate.conf' source='ninegate-nginx.conf' rm='True' mkdir='True' />   
     </files>
 
     <containers>
@@ -10,7 +9,6 @@
             <package>ninegate-apps</package>
 
             <file filelist='ninegate' name='/etc/apache2/sites-available/ninegate' source='ninegate-apache.conf' rm="True"/>
-            <file filelist='ninegate' name='/lib/systemd/system/wssninegate.service' source='ninegate.service'/>
             <file filelist="ninegate" name="/var/www/html/ninegate/app/config/parameters.yml" source="ninegate-parameters.yml" rm="True"/>
             <file filelist="ninegate" name="/var/www/html/ninegate/app/config/template.yml" source="ninegate-template.yml" rm="True"/>
             <file filelist="ninegate" name="/var/www/html/ninegate/scripts/ninegate-postservice-00.sh" source="ninegate-postservice-00.sh" rm="True" mode="700" />
@@ -20,12 +18,16 @@
             <file filelist='ninegate-migration' name='/var/www/html/envole-migration/config/config-db-ninegate.php' source='ninegate-migration.php' mkdir='True'/>
 
             <service method='apache' servicelist='ninegate'>ninegate</service>
-            <service servicelist="ninegate">wssninegate</service>
+
+            <service_access service='ninegate_websocket'>
+                <port port_type="SymLinkOption">ninegate_websocket_portexterne</port>
+            </service_access>
+
         </container>
     </containers>
 
     <variables>
-        <family name='Ninegate' icon='home'>
+        <family name='Ninegate'>
             <variable type='oui/non' name='activer_cadolesldap' description='Activer Annuaire Cadoles' hidden='True' exists='False'/>
             <variable type='string' name='cadolesldap_pwdadmin' description="Mot de passe du compte admin durant l'instance" hidden='True' exists='False'/>
             <variable type='string' name='cadolesldap_organization' description="Nom de l'organisation principale" hidden='True' exists='False'/>
@@ -37,7 +39,6 @@
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_adminer" type="oui/non" description="Activer Adminer" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_balado" type="oui/non" description="Activer Balado" hidden='True' exists='False'><value>non</value></variable>
-            <variable name="activer_cdt" type="oui/non" description="Activer CdT" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_dokuwiki" type="oui/non" description="Activer Dokuwiki" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_econnect" type="oui/non" description="Activer eConnect" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_ead_web" type="oui/non" description="Activer EAD" hidden='True' exists='False'><value>non</value></variable>
@@ -64,7 +65,6 @@
             <variable name="activer_roundcube" type="oui/non" description="Activer Roundcube" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_sacoche" type="oui/non" description="Activer Sacoche" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_wordpress" type="oui/non" description="Activer Wordpress" 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_sondepiwik_local" type="oui/non" description="Activer Sonde Piwik" hidden='True' exists='False'><value>non</value></variable>            
@@ -196,13 +196,6 @@
             <variable type='string'  name='ninegate_widbalado_url' description='URL complète de votre Balado'  mandatory='True' />
             <variable type='string'  name='ninegate_widbalado_syncenvole' description='URL Posh-Profil pour synchronisation Balado' mandatory='True' />
 
-            <!-- CDT -->
-            <variable type="oui/non" name='ninegate_activate_widcdt' description='Activer CdT'  mandatory='True'>
-                <value>non</value>
-            </variable>
-            <variable type='string'  name='ninegate_widcdt_url' description='URL complète de votre CdT'  mandatory='True' />
-            <variable type='string'  name='ninegate_widcdt_syncenvole' description='URL Posh-Profil pour synchronisation CdT' mandatory='True' />
-
             <!-- DOKUWIKI -->
             <variable type="oui/non" name='ninegate_activate_widdokuwiki' description='Activer Dokuwiki'  mandatory='True'>
                 <value>non</value>
@@ -379,6 +372,19 @@
             <variable type='string'  name='ninegate_widwordpress_url' description='URL complète de votre Wordpress'  mandatory='True' />
             <variable type='string'  name='ninegate_widwordpress_syncenvole' description='URL Posh-Profil pour synchronisation Wordpress' mandatory='True' />
 
+
+
+            <!-- WEBSOCKET -->
+            <variable type='string'  name='ninegate_websocket_url' description='Host du serveur Websocket'  mandatory='True' />
+            <variable type='string'  name='ninegate_websocket_portexterne' description='Port de commuinication externe du serveur Websocket'  mandatory='True' >
+                <value>5555</value>
+            </variable>
+            <variable type='string'  name='ninegate_websocket_portinterne' description='Port de commuinication interne du serveur Websocket'  mandatory='True'>
+                <value>5556</value>
+            </variable>
+
+
+
             <!-- EMAIL -->
             <variable type='string'  name='ninegate_noreply' description='Adresse mail utilisé pour le noreply' mandatory='True' />
             <variable type="oui/non" name='ninegate_activer_localmail' description="Utiliser le serveur d'envoi de mail local" mandatory='True'>
@@ -390,9 +396,9 @@
             <variable type='string'  name='ninegate_smtppwd' description='Fichier contenant le mot de passe associé du compte SMTP' />
             <variable type='string'  name='ninegate_smtpencryption' description='Type Encryptage du serveur SMTP' />
             <variable type='string'  name='ninegate_smtpauthmode' description='Mode Authentification du serveur SMTP' />
-        </family>
 
-        <family name='EoleDB' icon='database' mode='expert'>
+
+
             <!-- EOLEDB -->
             <variable type='string'  name='ninegate_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
             <variable type='string'  name='ninegate_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
@@ -408,7 +414,6 @@
             <separator name="ninegate_activate_portal">Paramètres associés aux modules à activer</separator>
             <separator name="ninegate_activate_widadminer">Paramètres associés à Adminer</separator>
             <separator name="ninegate_activate_widbalado">Paramètres associés à Balado</separator>
-            <separator name="ninegate_activate_widcdt">Paramètres associés à CdT</separator>
             <separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator>
             <separator name="ninegate_activate_wideconnect">Paramètres associés à eConnect</separator>
             <separator name="ninegate_activate_widead">Paramètres associés à EAD</separator>
@@ -436,9 +441,9 @@
             <separator name="ninegate_activate_widroundcube">Paramètres associés à Roundcube</separator>
             <separator name="ninegate_activate_widsacoche">Paramètres associés à Sacoche</separator>
             <separator name="ninegate_activate_widwordpress">Paramètres associés à Wordpress</separator>
-            <separator name="ninegate_activate_websocket">Paramètres associés au Serveur WEBSOCKET</separator>
+            <separator name="ninegate_websocket_url">Paramètres associés au Serveur WEBSOCKET</separator>
             <separator name="ninegate_noreply">Paramètres associés aux Mails</separator>
-            <separator name="ninegate_db_mode">Paramètres EoleDB associés à Ninegate</separator>
+            <separator name="ninegate_db_mode">Paramètres associés à la Base de Données</separator>
         </separators> 
     </variables>
 
@@ -448,11 +453,6 @@
             <target type='variable'>activer_ninegate</target>
         </condition>
 
-        <condition name='hidden_if_in' source='activer_revprox'>
-            <param>non</param>
-            <target type='filelist'>nineboard_nginx</target>
-        </condition>
-
         <condition name='hidden_if_in' source='activer_ninegate'>
             <param>non</param>
 
@@ -529,7 +529,6 @@
             <target type='variable'>ninegate_dbpass</target>
 
             <target type='filelist'>ninegate</target>
-            <target type='filelist'>ninegate_nginx</target>
             <target type='filelist'>ninegate-migration</target>
 
             <target type='servicelist'>ninegate</target>
@@ -725,7 +724,6 @@
 
             <target type='variable'>ninegate_activate_widadminer</target>
             <target type='variable'>ninegate_activate_widbalado</target>
-            <target type='variable'>ninegate_activate_widcdt</target>
             <target type='variable'>ninegate_activate_widdokuwiki</target>
             <target type='variable'>ninegate_activate_wideconnect</target>
             <target type='variable'>ninegate_activate_widead</target>
@@ -775,7 +773,6 @@
             <param>non</param>
 
             <target type='variable'>ninegate_widbalado_syncenvole</target>
-            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widlimesurvey_syncenvole</target>
             <target type='variable'>ninegate_widmoodle_syncenvole</target>
@@ -794,12 +791,30 @@
         <condition name='hidden_if_in' source='poshprofil_typesynchro'>
             <param>Annuaire</param>
             <target type='variable'>ninegate_widbalado_syncenvole</target>
-            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widnextcloud_syncenvole</target>
             <target type='variable'>ninegate_widsacoche_syncenvole</target>
         </condition>
 
+
+        <!-- AFFICHAGE EN FONCTION DU MODULE WEBSOCKET -->
+        <condition name='hidden_if_in' source='ninegate_activate_websocket'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_websocket_url</target>
+            <target type='variable'>ninegate_websocket_portinterne</target>
+            <target type='variable'>ninegate_websocket_portexterne</target>
+            <target type='servicelist'>ninegate_websocket</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_websocket_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_apache</param>
+            <param type='eole' name='match' hidden='False'>web_url</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
         <!-- AFFICHAGE EN FONCTION DU WIDGET ADMINER -->
         <fill name='calc_multi_condition' target='ninegate_activate_widadminer'>
             <param>oui</param>
@@ -824,7 +839,7 @@
 
 
 
-        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADO -->
+        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADAO -->
         <fill name='calc_multi_condition' target='ninegate_activate_widbalado'>
             <param>oui</param>
             <param type='eole' name='condition_1' hidden='False'>activer_balado</param>
@@ -855,39 +870,6 @@
         </fill>
 
 
-
-        <!-- AFFICHAGE EN FONCTION DU WIDGET CDT -->
-        <fill name='calc_multi_condition' target='ninegate_activate_widcdt'>
-            <param>oui</param>
-            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
-            <param name='match'>oui</param>
-            <param name='mismatch'>non</param>
-            <param name='default_mismatch'>non</param>
-        </fill>
-
-        <condition name='hidden_if_in' source='ninegate_activate_widcdt'>
-            <param>non</param>
-
-            <target type='variable'>ninegate_widcdt_url</target>
-            <target type='variable'>ninegate_widcdt_syncenvole</target>
-        </condition>   
-
-        <fill name='calc_multi_condition' target='ninegate_widcdt_url'>
-            <param>oui</param>
-            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
-            <param name='match'>/cdt</param>
-            <param name='default_mismatch'>None</param>
-        </fill>
-
-        <fill name='calc_multi_condition' target='ninegate_widcdt_syncenvole'>
-            <param>oui</param>
-            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
-            <param name='match'>/posh-profil</param>
-            <param name='default_mismatch'>None</param>
-        </fill>
-
-
-
         <!-- AFFICHAGE EN FONCTION DU WIDGET DOKUWIKI -->
         <fill name='calc_multi_condition' target='ninegate_activate_widdokuwiki'>
             <param>oui</param>

src/ninegate-1.0/app/config/config.yml

@@ -127,16 +127,16 @@ gos_web_socket:
         firewall: main
     shared_config: true
     server:
-        port: 443    #The port the socket server will listen on
-        host: %weburl%/wssninegate    #The host ip to bind to
+        port: %websocket_port%    #The port the socket server will listen on
+        host: %websocket_host%    #The host ip to bind to
 
         router:
             resources:
                 - "@CadolesWebsocketBundle/Resources/config/topic.yml" 
     pushers:
       wamp:
-        host: 0.0.0.0
-        port: 5556                
+        host: %websocket_host%
+        port: %websocket_portinterne%                
 
 # ckeditor configuration
 ivory_ck_editor:
@@ -147,7 +147,7 @@ ivory_ck_editor:
             language: fr
             toolbar: "my_toolbar_1"
             uiColor: "#ffffff"
-            extraPlugins: ["html5video"]
+            extraPlugins: ["html5video","pastebase64"]
         light_config:
             language: fr
             toolbar: "my_toolbar_2"

src/ninegate-1.0/scripts/ninegate-websocket.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
+websocket_url=$(CreoleGet adresse_ip_eth0 non) 
+websocket_portinterne=$(CreoleGet ninegate_websocket_portinterne non) 
 
 # Server Websocket
 if [[ "$1" != "restartifdown" ]]; then
     echo WEBSOCKET = STOP
-    pid="$(pgrep -a -f gos:websocket | grep 5556)"
+    pid="$(pgrep -a -f gos:websocket | grep $websocket_portinterne)"
     if [ -n "${pid}" ]; then
         IFS=' ' read -r -a array <<< "$pid"
         kill -9 ${array[0]};
@@ -11,7 +13,7 @@ if [[ "$1" != "restartifdown" ]]; then
 fi
 
 # Port LISTEN ?
-pid="$(pgrep -a -f gos:websocket | grep 5556)"
+pid="$(pgrep -a -f gos:websocket | grep $websocket_portinterne)"
 restart="yes"
 if [ "$1" == "restartifdown" ] && [ -n "${pid}" ] ; then
     restart="no"
@@ -20,5 +22,5 @@ fi
 if [ "$restart" == "yes" ] && [ "$1" != "stop" ] ; then
     echo WEBSOCKET = START
     cd /var/www/html/ninegate
-    systemctl restart wssninegate
+    bin/console gos:websocket:server --port $websocket_portinterne -a $websocket_url --no-debug -n -q --env=prod  & disown
 fi

src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php

@@ -78,37 +78,19 @@ class SecurityController extends Controller
             if($masteridentity=="LDAP") {
                 // Normalement la synchronisation des comptes aurait du générer le compte en base c'est donc pas normal
                 // Peut-être juste relancer une synchronisation
-                // On tente une synchronisation via methode SSO
-                $masteridentity="SSO";
-                // throw $this->createNotFoundException('Permission denied. Need to synchronize LDAP ? Contact your administrator');
+                throw $this->createNotFoundException('Permission denied. Need to synchronize LDAP ? Contact your administrator');
             }
 
             if($masteridentity=="SSO") {
                 if(empty($email)) $email = $username."@nomail.com";
 
-                // On s'assure qu'il n'y a pas déjà un utilisateur avec le même mail
-                $usermail = $em->getRepository('CadolesCoreBundle:User')->findOneBy(array("email"=>$email));
-                if($usermail) {
-                    return $this->render('CadolesCoreBundle:Registration:info.html.twig', [
-                        'useheader'         => true,
-                        'usemenu'           => false,
-                        'usesidebar'        => false,                   
-                        'infotitle'         => "Première connexion",
-                        'info'              => "Votre compte ne peut être activé car votre adresse mel est déjà utilisée par un autre compte utilisateur.<br>Nous sommes désolés du désagrément et vous invitons à contacter un administrateur.",
-                        'mode'              => "error",
-                        'redirectto'         => "",
-                    ]);
-                }
-
                 // Là c'est normal que potentiellement il n'existe pas il faut donc l'autogénérer
                 $user = new User();
 
                 // On calcule le niveau01 de l'utilisateur
                 $niveau01=$em->getRepository('CadolesCoreBundle:Niveau01')->calculateNiveau01($attributes);
-                if(!$niveau01) {
-                    $niveau01=$em->getRepository('CadolesCoreBundle:Niveau01')->findAll()[0];
-                    //throw $this->createNotFoundException('Permission denied. No Organisation Niveau 01 match');
-                }
+                if(!$niveau01)
+                    throw $this->createNotFoundException('Permission denied. No Organisation Niveau 01 match');
 
                 $user->setUsername($username);
                 $user->setEmail($email);

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php

@@ -228,17 +228,9 @@ class InitDataCommand extends ContainerAwareCommand
             $this->addModeration($profil,'cadoles_portal_config_flux',1);
             $this->addModeration($profil,'cadoles_portal_config_notice',1);
             $this->addModeration($profil,'cadoles_portal_config_icon',1);
-            $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
-            $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
-            $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
-            $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
             $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
             $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
-            $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
-            $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
-            $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
             $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
-
             $this->addModeration($profil,'cadoles_core_config_statistic',1);
             $this->addModeration($profil,'cadoles_core_config_mailing',1);
             $this->addModeration($profil,'cadoles_core_config_importuser',0);

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/PurgeFileCommand.php

@@ -380,46 +380,6 @@ class PurgeFileCommand extends Command
                     if($result) $find=true;
                 }
 
-                // Si pas trouvé on la cherche dans les projecttask
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Projecttask")->createQueryBuilder('projecttask')
-                            ->where('projecttask.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les projectcomment
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Projectcomment")->createQueryBuilder('projectcomment')
-                            ->where('projectcomment.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les blogcomment
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Blogcomment")->createQueryBuilder('blogcomment')
-                            ->where('blogcomment.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les alert
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Alert")->createQueryBuilder('alert')
-                            ->where('alert.content LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
                 // Si pas trouvé on supprime
                 if(!$find) {
                     $this->writeln($name);

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/ScriptCommand.php

@@ -168,32 +168,6 @@ class ScriptCommand extends Command
             $this->writeln("");
         }
 
-        $script=$this->em->getRepository("CadolesCoreBundle:Script")->findOneBy(["name"=>"updateorthographe02"]);
-        if(!$script) {
-            $this->writeln("== SCRIPT = updateorthographe02");
-            $this->updateorthographe02();
-            
-            $script=new Script();
-            $script->setName("updateorthographe02");
-            $this->em->persist($script);
-            $this->em->flush();                  
-            $this->writeln("");
-        }
-
-        if($this->container->getParameter('ldap_template')=="scribe") {
-            $script=$this->em->getRepository("CadolesCoreBundle:Script")->findOneBy(["name"=>"purgepageprofil"]);
-            if(!$script) {
-                $this->writeln("== SCRIPT = purgepageprofil");
-                $this->purgepageprofil();
-                
-                $script=new Script();
-                $script->setName("purgepageprofil");
-                $this->em->persist($script);
-                $this->em->flush();                  
-                $this->writeln("");
-            }
-        }
-
         return 1;
     }
 
@@ -436,31 +410,6 @@ class ScriptCommand extends Command
         }        
     }
 
-    private function updateorthographe02(){
-        $entityItem = $this->em->getRepository('CadolesPortalBundle:Item')->find(-398);
-        if($entityItem) {
-            if($entityItem->getSubtitle()!="Messagerie") {
-                $entityItem->setSubtitle("Messagerie");
-                $entityItem->setContent("Messagerie permettant la communication sécurisée par méls. La messagerie n’a pas pour but d’envoyer des gros fichiers mais plutôt de communiquer des informations, des liens.");
-                $this->em->persist($entityItem);
-                $this->em->flush();                
-            }                
-        }
-    }
-
-    private function purgepageprofil() {
-        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Enseignants']);
-        if($page) {
-            $this->em->remove($page);
-            $this->em->flush();
-        }
-
-        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Administratifs']);
-        if($page) {
-            $this->em->remove($page);
-            $this->em->flush();
-        }
-    }
 
 
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php

@@ -128,7 +128,7 @@ class SynchroCommand extends Command
                     $ldapfilter="(|(&(uid=*)(ENTPersonProfils=enseignant))(&(uid=*)(typeadmin=0))(&(uid=*)(typeadmin=2)))";
                     $label="PROFIL - Enseignants";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
 
                     // Responsables
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=responsable))";
@@ -140,20 +140,7 @@ class SynchroCommand extends Command
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=administratif))";
                     $label="PROFIL - Administratifs";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
-
-                    // Niveaux
-                    $this->writeln('');
-                    $this->writeln('== NIVEAUX ==========================================');
-                    $results = $this->ldap->search("type=Niveau", ['cn','description','gidNumber'], $this->ldap_basedn);
-                    foreach($results as $result) {
-                        $cn=$result["cn"];
-                        $ldapfilter="(&(type=Niveau)(cn=$cn))";
-
-                        $label="NIVEAU - ".$result["cn"];
-                        $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
-                    }
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
 
                     // Classes
                     $this->writeln('');
@@ -168,32 +155,6 @@ class SynchroCommand extends Command
                         if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);                        
                     }
 
-                    // Elèves des Classes
-                    $this->writeln('');
-                    $this->writeln('== ELEVES DES CLASSES ==========================================');
-                    $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
-                    foreach($results as $result) {
-                        $cn=$result["cn"];
-                        $ldapfilter="(&(type=Classe)(cn=$cn))";
-
-                        $label="ELEVES - ".$result["cn"];
-                        $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
-                    }
-
-                    // Professeurs des Classes
-                    $this->writeln('');
-                    $this->writeln('== PROFESSEURS DES CLASSES ==========================================');
-                    $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
-                    foreach($results as $result) {
-                        $cn=$result["cn"];
-                        $ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))";
-
-                        $label="PROFESSEURS - ".$result["cn"];
-                        $this->writeln("    - $label");
-                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
-                    }
-
                     // Options
                     $this->writeln('');
                     $this->writeln('== OPTIONS ==========================================');

src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/PermmodoprofilController.php

@@ -331,15 +331,8 @@ class PermmodoprofilController extends Controller
         $this->addModeration($profil,'cadoles_portal_config_flux',1);
         $this->addModeration($profil,'cadoles_portal_config_notice',1);
         $this->addModeration($profil,'cadoles_portal_config_icon',1);
-        $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
-        $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
-        $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
-        $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
         $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
         $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
-        $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
-        $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
-        $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
         $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
         $this->addModeration($profil,'cadoles_core_config_statistic',1);
         $this->addModeration($profil,'cadoles_core_config_mailing',1);

src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php

@@ -13,15 +13,12 @@
     class sessionListener {
         protected $container;
         protected $em;
-        protected $token_storage;
-        protected $session;
 
-        public function __construct($container, EntityManager $em, TokenStorageInterface $token_storage,Session $session)
+        public function __construct($container, EntityManager $em, TokenStorageInterface $token_storage)
         {
             $this->container = $container;
             $this->em = $em;
             $this->token_storage = $token_storage;
-            $this->session = $session;
         }
 
         public function haveRole($curentuser,$roles,$tohave,$route) {
@@ -47,7 +44,7 @@
         }
 
         public function onDomainParse(Event $event) {
-            $session = $this->session;
+            $session = new Session();
 
             $configs = $this->em->getRepository("CadolesCoreBundle:Config")->findAll();
             foreach($configs as $config) {
@@ -94,7 +91,6 @@
             $app["activate_widwordpress"]               =$this->container->getParameter('activate_widwordpress');
 
             $app["widbalado_activate_syncenvole"]       =$this->container->getParameter('widbalado_activate_syncenvole');
-            $app["widcdt_activate_syncenvole"]          =$this->container->getParameter('widcdt_activate_syncenvole');
             $app["widgepi_activate_syncenvole"]         =$this->container->getParameter('widgepi_activate_syncenvole');
             $app["widnextcloud_activate_syncenvole"]    =$this->container->getParameter('widnextcloud_activate_syncenvole');
             $app["widpiwik_activate_syncenvole"]        =$this->container->getParameter('widpiwik_activate_syncenvole');

src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailType.php

@@ -52,7 +52,7 @@ class MailType extends AbstractType
             'mapped'=> false,
             'required' => false,
             'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "150px"]
+            'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
         ]);
     }
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailingType.php

@@ -99,7 +99,7 @@ class MailingType extends AbstractType
                 'mapped'=> false,
                 'required' => true,
                 'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-                'config' => ["height" => "400px"]
+                'config' => ["height" => "400px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
             ]);
 
     }

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml

@@ -26,7 +26,7 @@ services:
     cadoles.core.session.listener:
         public: true
         class: Cadoles\CoreBundle\EventListener\sessionListener
-        arguments: ['@service_container','@doctrine.orm.entity_manager',"@security.token_storage","@session"]
+        arguments: ['@service_container','@doctrine.orm.entity_manager',"@security.token_storage"]
         tags:
             - { name: kernel.event_listener, event: kernel.request, method: onDomainParse }
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css

@@ -60,17 +60,6 @@ body {
     height: 20px;
 }
 
-@media (max-width: 991px) {
-    .header .title{
-        font-size: 30px;
-    }
-
-    .header small {
-        font-size:14px;
-        top: 25px;
-    }
-}
-
 @media (max-width: 767px) {
     .header { display: none }
     #menu-header { display: none }
@@ -127,19 +116,6 @@ body {
     right: 30px;    
 }
 
-.navbar-top-links #navbar-nameuser {
-    position: relative;
-    top: -8px;
-    right: inherit;
-}
-
-@media (max-width: 991px) {
-    .navbar-top-links #navbar-nameuser {
-        display: none;
-    }
-}
-
-
 @media (max-width: 767px) {
     .navbar-default .navbar-header #title {
         display: none;
@@ -765,11 +741,6 @@ a.item-heart {
     max-width: 100%;
 }
 
-.widget-ckeditor img {
-    height:auto !important;
-}
-
-
 .frameitem {
     position: absolute;
     right: 0px;

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css

@@ -49,12 +49,6 @@
 
 .header.reduit .avatar {height: 25px; }
 
-.header.reduit #navbar-nameuser
-{
-    top: 14px;
-    right: 210px;
-}
-
 /* ===================== FIN MODE REDUIT ==========================*/
 
 /* fix defaut d'affichage sur toogle switch */
@@ -63,11 +57,7 @@ body {
     background: linear-gradient(180deg, var(--main), white,50%);
 }
 
-#navbar-nameuser a {
-    color: var(--main, #004d9a) !important;
-}
-
-body.eleves, body.grp-National_1, body.grp-eleves {
+body.eleves, body.grp-National_1 {
     --colorbody: #ffffff;
     --main: #169b62;
     --mainR: 22;
@@ -87,7 +77,7 @@ body.eleves, body.grp-National_1, body.grp-eleves {
 /* responsables #MAUVE #7D4E5B
  */
 
-body.responsables, body.grp-National_2,body.grp-responsables  {
+body.responsables, body.grp-National_2 {
     --colorbody: #ffffff;
     --main: #7d4e5b;
     --mainR: 125;
@@ -106,7 +96,7 @@ body.responsables, body.grp-National_2,body.grp-responsables  {
 
 
 /* professeurs, enseignants1d #BLEU1 #5770BE  */
-body.professeurs, body.enseignants1d, body.grp-National_3, body.grp-professeurs {
+body.professeurs, body.enseignants1d, body.grp-National_3 {
     --colorbody: #ffffff;
     --main: #5770be;
     --mainR: 87;
@@ -124,7 +114,7 @@ body.professeurs, body.enseignants1d, body.grp-National_3, body.grp-professeurs
 }
 
 /* administratifs, admin #ORANGE #FF6F4C  */
-body.administratifs, body.admin, body.grp-National_4 , body.grp-National_5, body.grp-National_6 , body.grp-administratifs,    {
+body.administratifs, body.admin, body.grp-National_4 , body.grp-National_5, body.grp-National_6     {
     --colorbody: #ffffff;
     --main: #ff6f4c;
     --mainR: 255;
@@ -288,9 +278,7 @@ div.header > a.title > span {
 }
 .nav.navbar-top-links.navbar-right > li a:hover {
     color: var(--fontcolorhover, white) !important;
-    background: var(--light, black) !important;
-    border-radius: 5px;
-    padding-top: 1px;
+    background: var(--fontcolorhoverdark, black) !important;
 }
 
 /* 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/update.html.twig

@@ -2,7 +2,7 @@
 
 {% block pagewrapper %}
 {{ form_start(form) }}
-    <h1 class="page-header">Modification Configuration Générale = {{config.id}}</h1>
+    <h1 class="page-header">Modification Configuration Générale</h1>
 
     {{ form_widget(form.submit) }}  <a class="btn btn-default" href={{ path('cadoles_core_config_commun') }}>Annuler</a>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig

@@ -4,11 +4,11 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Groupe = {{ group.label }}
+    Modification Groupe
     {% elseif mode=="submit" %}
     Création Groupe
     {% elseif mode=="delete" %}
-    Suppression Groupe = {{ group.label }}
+    Suppression Groupe
     {% endif %}
     </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig

@@ -4,11 +4,11 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification {{ labelniveau01 }} = {{niveau01.label}}
+    Modification {{ labelniveau01 }}
     {% elseif mode=="submit" %}
     Création {{ labelniveau01 }}
     {% elseif mode=="delete" %}
-    Suppression {{ labelniveau01 }} = {{niveau01.label}}
+    Suppression {{ labelniveau01 }}
     {% endif %}
     </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig

@@ -4,11 +4,11 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification {{ labelniveau02 }} = {{niveau02.label}}
+    Modification {{ labelniveau02 }}
     {% elseif mode=="submit" %}
     Création {{ labelniveau02 }}
     {% elseif mode=="delete" %}
-    Suppression {{ labelniveau02 }} = {{niveau02.label}}
+    Suppression {{ labelniveau02 }}
     {% endif %}
     </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Permmodoprofil/edit.html.twig

@@ -4,11 +4,11 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Profil de Modération = {{ permmodoprofil.name }}
+    Modification Profil de Modération
     {% elseif mode=="submit" %}
     Création Profil de Modération
     {% elseif mode=="delete" %}
-    Suppression Profil de Modération = {{ permmodoprofil.name }}
+    Suppression Profil de Modération
     {% endif %}
     </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig

@@ -5,11 +5,11 @@
     {% if moderegistration!="none" %}
         <h1 class="page-header">
         {% if mode=="send" %}
-        Confirmation à l'Utilisateur = {{ registration.username }}
+        Confirmation à l'Utilisateur
         {% elseif mode=="submit" %}
         Inscription
         {% elseif mode=="delete" %}
-        Suppression Inscription = {{ registration.username }}
+        Suppression Inscription
         {% endif %}
         </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/info.html.twig

@@ -1,25 +1,13 @@
 {% extends '@CadolesCore/base.html.twig' %}
 
 {% block pagewrapper %}
-    <h1 class="page-header">{%if infotitle is defined%}{{infotitle}}{%else%}Inscriptions{%endif%}</h1>
+    <h1 class="page-header">Inscriptions</h1>
 
     <div style="padding-top:50px;max-width: 1000px; margin:auto; font-size:18px;">
         <div class='alert alert-{{ mode }}' style='margin: 5px 0px'>
             {% autoescape %}
             <p>{{ info|raw }}</p>
             {% endautoescape %}
-
-            {% if mode=="error" %}
-                {% if mode_auth == "SAML" %}
-                <a class="btn btn-primary" href="{{ path("lightsaml_sp.logout") }}">Déconnexion</a>
-                {% elseif mode_auth == "CAS"  %}
-                <a class="btn btn-primary" href="{{ path("cas_sp.logout") }}">Déconnexion</a>
-                {% elseif mode_auth == "SQL"  %}
-                <a class="btn btn-primary" href="{{ path("cadoles_core_logout") }}">Déconnexion</a>
-                {% elseif mode_auth == "LDAP"  %}
-                <a class="btn btn-primary" href="{{ path("cadoles_core_ldap_logout") }}">Déconnexion</a>
-                {% endif %}
-            {% endif %}
         </div>
     </div>
 {% endblock %}

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig

@@ -5,7 +5,7 @@
     <h1 class="page-header">
     {% if mode=="update" %}
         {% if access=="config" %}
-            Modification Utilisateur = {{ user.username}}
+            Modification Utilisateur
         {% else %}
             Profil
         {% endif %}

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Whitelist/edit.html.twig

@@ -4,11 +4,11 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Liste Blanche = {{ whitelist.label }}
+    Modification Liste Blanche
     {% elseif mode=="submit" %}
     Création Liste Blanche
     {% elseif mode=="delete" %}
-    Suppression Liste Blanche = {{ whitelist.label }}
+    Suppression Liste Blanche
     {% endif %}
     </h1>
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig

@@ -110,9 +110,6 @@
                     </div>
     
                     <ul class="nav navbar-top-links navbar-right">
-                        {% if app.user %}
-                            <a id="navbar-nameuser" href="{{ path('cadoles_core_user') }}" title="Profil">{{ app.user.firstname }} {{ app.user.lastname }}</a>
-                        {% endif %}
                         {% if mustread is not  defined  %}
                             {{ include('@CadolesCore/Include/menu.html.twig') }}
                         {% endif %}

src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php

@@ -200,8 +200,7 @@ class ApiController extends Controller
 		$bookmarks=null;
 		$items=null;
 		$itemcategorys=null;
-        # fixe #31884 "https://" => "//"
-		$weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
+		$weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
 
         $em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,$ssoitems,3);
 
@@ -674,10 +673,10 @@ $api('$id',data);";
     }
 
     public function sessionAction($id="",$access="config") {
-        // mode_auth
-        $mode_auth=$this->getParameter("mode_auth");
-        if($mode_auth!="CAS") {
-            $output["error"]="Le bundle Edispatcher ne fonctionne qu'en mode mode_auth=CAS";
+        // Masteridentity
+        $masteridentity=$this->getParameter("masteridentity");
+        if($masteridentity!="SSO") {
+            $output["error"]="Le bundle Edispatcher ne fonctionne qu'en mode MasterIdentity=SSO";
             return new Response(json_encode($output), 400);
         }
 

src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Resources/Theme-Metice/style.css

@@ -12,10 +12,6 @@ div.header {
     position: relative !important;
 }
 
-#navbar-nameuser a {
-    color: var(--main, #004d9a) !important;
-}
-
 div.header > a > span {
     color: black !important;
 }

src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php

@@ -43,7 +43,6 @@ class InitDataCommand extends ContainerAwareCommand
 
         $activate_widadminer        = $this->getContainer()->getParameter('activate_widadminer');
         $activate_widbalado         = $this->getContainer()->getParameter('activate_widbalado');
-        $activate_widcdt            = $this->getContainer()->getParameter('activate_widcdt');
         $activate_widdokuwiki       = $this->getContainer()->getParameter('activate_widdokuwiki');
         $activate_wideconnect       = $this->getContainer()->getParameter('activate_wideconnect');
         $activate_widead            = $this->getContainer()->getParameter('activate_widead');
@@ -415,29 +414,6 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityItem);            
         }
 
-        // Item CdT
-        if($activate_widcdt) {
-            $widcdt_url =$this->getContainer()->getParameter('widcdt_url');
-            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-391);
-            if(!$entityItem) {
-                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_cdt.png"]);
-
-                $entityItem = new Item();
-                $entityItem->setId(-391);
-                $entityItem->setRowOrder(0);
-                $entityItem->setTitle('CdT');
-                $entityItem->setSubtitle("Application complète de gestion de cahier de texte scolaire");
-                $entityItem->SetContent("Application complète de gestion de cahier de texte scolaire");
-                $entityItem->setIcon($entityicon);
-                $entityItem->setTarget("_blank");
-                $entityItem->setItemcategory($entityItemcategoryapp);
-                $entityItem->setEssential(true);
-                $entityItem->addGroup($groupall);
-            }
-            $entityItem->setUrl($widcdt_url);
-            $em->persist($entityItem);            
-        }
-
         // Item Dokuwiki
         if($activate_widdokuwiki) {
             $widdokuwiki_url =$this->getContainer()->getParameter('widdokuwiki_url');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertController.php

@@ -8,7 +8,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Form\FormError;
-use Symfony\Component\Filesystem\Filesystem;
 
 use Cadoles\PortalBundle\Entity\Alert;
 use Cadoles\PortalBundle\Form\AlertType;
@@ -196,32 +195,6 @@ class AlertController extends Controller
         return $response;        
     }
 
-    public function uploadAction(Request $request,$access=null) {
-        // Fichier temporaire uploadé
-        $tmpfile    = $request->files->get('upload');
-        $extention  = $tmpfile->getClientOriginalExtension();
-
-        // Répertoire de Destination
-        $fs         = new Filesystem();
-        $rootdir    = $this->get('kernel')->getRootDir()."/../web";
-        $fs->mkdir($rootdir."/uploads/ckeditor");
-        
-        // Fichier cible
-        $targetName = uniqid().".".$extention;
-        $targetFile = $rootdir."/uploads/ckeditor/".$targetName;
-        $targetUrl  = "/".$this->getParameter('alias')."/uploads/ckeditor/".$targetName;
-        $message    = "";
-
-        move_uploaded_file($tmpfile,$targetFile);
-        
-        $output["uploaded"]=1;
-        $output["fileName"]=$targetName;
-        $output["url"]=$targetUrl;
-
-        return new Response(json_encode($output));
-
-    } 
-
     public function readAction(Request $request) {
         $output=array();
         $id=$request->request->get('id');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php

@@ -361,7 +361,7 @@ class BlogController extends Controller
             if($groups[0]) {
                 if($groups[0]->getFgcanshare()) {
                     $pages=$groups[0]->getPages();
-                    if($pages[0]) {
+                    if($pages) {
                         $idpage=$pages[0]->getId();
                         $groups=$pages[0]->getGroups();
                         $idgroup=$groups[0]->getId();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogarticleController.php

@@ -182,7 +182,7 @@ class BlogarticleController extends Controller
         if($groups[0]) {
             if($groups[0]->getFgcanshare()) {
                 $pages=$groups[0]->getPages();
-                if($pages[0]) {
+                if($pages) {
                     $idpage=$pages[0]->getId();
                     $groups=$pages[0]->getGroups();
                     $idgroup=$groups[0]->getId();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php

@@ -341,7 +341,7 @@ class CalendarController extends Controller
             if($groups[0]) {
                 if($groups[0]->getFgcanshare()) {
                     $pages=$groups[0]->getPages();
-                    if($pages[0]) {
+                    if($pages) {
                         $idpage=$pages[0]->getId();
                         $groups=$pages[0]->getGroups();
                         $idgroup=$groups[0]->getId();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php

@@ -65,18 +65,13 @@ class ItemController extends Controller
     {
         // Initialisation de l'enregistrement
         $data = new Item();
-        if($this->GetParameter("activate_widsonde")) {
-            $data->setClicksonde(true);
-            $data->setClicksondeservice("PAGE_ENT");
-        }
-
+        
         // Création du formulaire
         $form = $this->createForm(ItemType::class,$data,array(
             "mode"                  => "submit",
             "labelniveau01"         => $this->GetParameter("labelsniveau01"),
             "ssosynchroitem"        => $this->GetParameter("ssosynchroitem"),
-            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item"),
-            "activate_widsonde"     => $this->GetParameter("activate_widsonde"),
+            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item")
         ));
 
         // Récupération des data du formulaire
@@ -127,8 +122,7 @@ class ItemController extends Controller
             "idicon"                => ($data->getIcon()?$data->getIcon()->getId():null),
             "labelniveau01"         => $this->GetParameter("labelsniveau01"),
             "ssosynchroitem"        => $this->GetParameter("ssosynchroitem"),
-            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item"),
-            "activate_widsonde"     => ($this->GetParameter("activate_widsonde")&&$data->getId()>0),
+            "user_attr_cas_item"    => $this->GetParameter("user_attr_cas_item")
         ));
 
         // Récupération des data du formulaire
@@ -210,26 +204,6 @@ class ItemController extends Controller
         return $response;        
     }
 
-
-    public function forceorderAction(Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $categorys=$em->getRepository("CadolesPortalBundle:Itemcategory")->findAll();
-        
-        foreach($categorys as $category) {
-            $i=0;
-            $items=$em->getRepository("CadolesPortalBundle:Item")->findBy(["itemcategory"=>$category],["title"=>"ASC"]);
-            foreach($items as $item) {
-                $i++;
-                $item->setRowOrder($i);
-                $em->flush();
-            }
-        }
-
-        // Retour à la liste
-        return $this->redirectToRoute($this->labelroute);
-    }
-
     protected function getDatas()
     {
         $em = $this->getDoctrine()->getManager();
@@ -256,13 +230,6 @@ class ItemController extends Controller
         if ($form->get('submit')->isClicked() && $mode=="submit") {
         }
 
-        if ($form->get('submit')->isClicked() && ($mode=="submit" || $mode=="update")) {
-            // si clicksonde alors clicksondeservice obligatoire
-            if ($data->getClicksonde() && !$data->getClicksondeservice()) {
-                $form->addError(new FormError('Type de service sur le click sonde est obligatoire'));
-            }
-        }
-
         if ($form->get('submit')->isClicked() && !$form->isValid()) {
             $this->get('session')->getFlashBag()->clear();
             $validator = $this->get('validator');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php

@@ -362,7 +362,7 @@ class ProjectController extends Controller
             if($groups[0]) {
                 if($groups[0]->getFgcanshare()) {
                     $pages=$groups[0]->getPages();
-                    if($pages[0]) {
+                    if($pages) {
                         $idpage=$pages[0]->getId();
                         $groups=$pages[0]->getGroups();
                         $idgroup=$groups[0]->getId();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjecttaskController.php

@@ -207,7 +207,7 @@ class ProjecttaskController extends Controller
         if($groups[0]) {
             if($groups[0]->getFgcanshare()) {
                 $pages=$groups[0]->getPages();
-                if($pages[0]) {
+                if($pages) {
                     $idpage=$pages[0]->getId();
                     $groups=$pages[0]->getGroups();
                     $idgroup=$groups[0]->getId();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php

@@ -39,20 +39,6 @@ class SyncenvoleController extends Controller
         ]);        
     }
 
-    public function cdtAction()
-    {
-        $url=$this->getParameter("widcdt_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=cdt&color=#color#"
-        ]);        
-    }
-
     public function gepiannuAction()
     {
         $url=$this->getParameter("widgepi_syncenvole");

src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alert.php

@@ -149,7 +149,7 @@ class Alert
     {
         $today = new \DateTime();
         if (null === $this->unpublishedat) {
-            return false;
+            return true;
         }
         if ($this->unpublishedat->getTimestamp() < $today->getTimestamp()) {
             return true;

src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php

@@ -122,20 +122,6 @@ class Item
      */
     private $icon;
 
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="clicksonde", type="boolean", nullable=true, options={"default":false})
-     */
-    private $clicksonde = false;    
-
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(name="clicksondeservice", type="string", nullable=true)
-     */
-    private $clicksondeservice;    
-
     /**
      * @var ArrayCollection $bookmark
      * @var Bookmark
@@ -695,52 +681,4 @@ class Item
     {
         return $this->badgeurl;
     }
-
-    /**
-     * Set clicksonde
-     *
-     * @param boolean $clicksonde
-     *
-     * @return Item
-     */
-    public function setClicksonde($clicksonde)
-    {
-        $this->clicksonde = $clicksonde;
-
-        return $this;
-    }
-
-    /**
-     * Get clicksonde
-     *
-     * @return boolean
-     */
-    public function getClicksonde()
-    {
-        return $this->clicksonde;
-    }
-
-    /**
-     * Set clicksondeservice
-     *
-     * @param string $clicksondeservice
-     *
-     * @return Item
-     */
-    public function setClicksondeservice($clicksondeservice)
-    {
-        $this->clicksondeservice = $clicksondeservice;
-
-        return $this;
-    }
-
-    /**
-     * Get clicksondeservice
-     *
-     * @return string
-     */
-    public function getClicksondeservice()
-    {
-        return $this->clicksondeservice;
-    }
 }

src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php

@@ -33,7 +33,7 @@ class AlertType extends AbstractType
                 "label"         => 'Description',
                 "required"      => false,
                 "disabled"      => ($options["mode"]=="delete"?true:false),
-                "config"        => array("height" => "500px","filebrowserUploadRoute" => 'cadoles_portal_config_alert_upload')
+                "config"        => array("height" => "500px")
             ])
 
             ->add("fghideable",ChoiceType::class,[
@@ -118,13 +118,14 @@ class AlertType extends AbstractType
                         
             ->add('publishedat', DateType::class, [
                 'label'         => 'Publier du',
-                "widget"        => 'single_text',
+                'input'         => 'datetime',
             ])
 
             ->add('unpublishedat', DateType::class, [
                 'label'         => 'Jusqu\'au',
+                'input'         => 'datetime',
                 'required'      => false,
-                "widget"        => 'single_text',
+                'years'         => range(date('Y'), date('Y')+10)
             ]);
 
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php

@@ -146,54 +146,6 @@ class ItemType extends AbstractType
                 "disabled"      => ($options["mode"]=="delete"?true:false),
             ]);            
         }
-
-
-        if($options["activate_widsonde"]) {
-            $builder
-            /*
-            ->add('clicksonde', CheckboxType::class, [
-                "label"         => "Exécuter une sonde statistique sur le clic",
-                "required"      => false
-            ])
-            */   
-            
-            ->add('clicksondeservice', ChoiceType::class, [
-                "label" => 'Type de Service associé à la sonde',
-                "label_attr" => array("style" => "display:inline"),
-                "placeholder" => 'Sélectionner un service',     
-                "required" => false,
-                "choices" => [
-                    "ACCUEIL" => "ACCUEIL",
-                    "ACTUALITES" => "ACTUALITES",
-                    "CAHIER TEXTES" => "CAHIER_TEXTES",
-                    "CAHIER LIAISON" => "CAHIER_LIAISON",
-                    "COURRIER ELECTRONIQUE" => "COURRIER_ELECTRONIQUE",
-                    "MESSAGERIE INSTANTANEE" => "MESSAGERIE_INSTANTANEE",
-                    "VISIOCONFERENCE" => "VISIOCONFERENCE",
-                    "STOCKAGE PARTAGE" => "STOCKAGE_PARTAGE",
-                    "PRODUCTION COLLABORATIVE" => "PRODUCTION_COLLABORATIVE",
-                    "DOCUMENTATION CDI" => "DOCUMENTATION_CDI",
-                    "PARCOURS PEDAGOGIQUE" => "PARCOURS_PEDAGOGIQUE",
-                    "RESERVATION SALLES MATERIELS" => "RESERVATION_SALLES_MATERIELS",
-                    "SERVICE COLLECTIVITE" => "SERVICE_COLLECTIVITE",
-                    "SERVICES VIE SCOLAIRE" => "SERVICES_VIE_SCOLAIRE",
-                    "GESTION TEMPS" => "GESTION_TEMPS",
-                    "ABSENCES" => "ABSENCES",
-                    "GESTION COMPETENCES" => "GESTION_COMPETENCES",
-                    "NOTES" => "NOTES",
-                    "MANUEL NUMERIQUE" => "MANUEL_NUMERIQUE",
-                    "RESSOURCE MULTIMEDIA" => "RESSOURCE_MULTIMEDIA",
-                    "RESSOURCE ORIENTATION" => "RESSOURCE_ORIENTATION",
-                    "RESSOURCE PRODUCTION" => "RESSOURCE_PRODUCTION",
-                    "RESSOURCE ACCOMPAGNEMENT ENTRAINEMENT" => "RESSOURCE_ACCOMPAGNEMENT_ENTRAINEMENT",
-                    "RESSOURCE REFERENCE DICTIONNAIRE" => "RESSOURCE_REFERENCE_DICTIONNAIRE",
-                    "RESSOURCE DOCUMENTAIRE" => "RESSOURCE_DOCUMENTAIRE",
-                    "PAGE ENT" => "PAGE_ENT",
-                ],                
-                "disabled"      => ($options["mode"]=="delete"?true:false),
-            ]);
-            
-        }        
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -205,7 +157,6 @@ class ItemType extends AbstractType
             'labelniveau01' => "string",
             'ssosynchroitem' => "string",
             'user_attr_cas_item' => "string",
-            "activate_widsonde" => "string",
         ]);
     }
 }

src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/AlertRepository.php

@@ -45,9 +45,7 @@ class AlertRepository extends EntityRepository
         $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
         $niveau01=($user?$user->getNiveau01():null);
         $groups=($user?$user->getGroups():[]);
-
-        $userreads=($user?$user->getAlertreaders():new ArrayCollection());
-
+        
         // Initialisation du calcul des alerts
         $alerts=new ArrayCollection();
 
@@ -69,9 +67,8 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsroles=$qb->getQuery()->getResult();
-
             foreach($alertsroles as $alertrole) {
-                if(!$alerts->contains($alertrole)&&!$userreads->contains($alertrole)) $alerts->add($alertrole);
+                if(!$alerts->contains($alertrole)&&!$alertrole->getReaders()->contains($user)) $alerts->add($alertrole);
             }
         }
 
@@ -94,7 +91,7 @@ class AlertRepository extends EntityRepository
         }
         $alertsniveau01s=$qb->getQuery()->getResult();
         foreach($alertsniveau01s as $alertniveau01) {
-            if(!$alerts->contains($alertniveau01)&&!$userreads->contains($alertniveau01)) $alerts->add($alertniveau01);
+            if(!$alerts->contains($alertniveau01)&&!$alertniveau01->getReaders()->contains($user)) $alerts->add($alertniveau01);
         }
 
         // Récupération des alerts par group
@@ -116,8 +113,8 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsgroups=$qb->getQuery()->getResult();
-            foreach($alertsgroups as $alertgroup) {             
-                if(!$alerts->contains($alertgroup)&&!$userreads->contains($alertgroup)) $alerts->add($alertgroup);
+            foreach($alertsgroups as $alertgroup) {
+                if(!$alerts->contains($alertgroup)&&!$alertgroup->getReaders()->contains($user)) $alerts->add($alertgroup);
             }
         }
 
@@ -144,8 +141,8 @@ class AlertRepository extends EntityRepository
                     ->setParameter("alertcategory",$alertcategoryfilter);
             }
             $alertsitems=$qb->getQuery()->getResult();
-            foreach($alertsitems as $alertitem) {               
-                if(!$alerts->contains($alertitem)&&!$userreads->contains($alertitem)) $alerts->add($alertitem);
+            foreach($alertsitems as $alertitem) {
+                if(!$alerts->contains($alertitem)&&!$alertitem->getReaders()->contains($user)) $alerts->add($alertitem);
             }
         }
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php

@@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 
 class ItemRepository extends EntityRepository
 {
-    public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$ssoitems=[],$withbookmark=1,$fgessential=false) {
+    public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$ssoitems,$withbookmark=1,$fgessential=false) {
         // Profilage
         $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
         $groups=($user?$user->getGroups():[]);
@@ -114,28 +114,26 @@ class ItemRepository extends EntityRepository
 
         // Récupération des items par ssoitem
         $itemsssoitems=[];
-        if(is_array($ssoitems)) {
-            foreach($ssoitems as $ssoitem) {
-                $qb = $this->getEntityManager()->createQueryBuilder();
-                $qb->select('item')
-                    ->from("CadolesPortalBundle:Item", 'item')
-                    ->where("item.ssoitem=:ssoitem ")
-                    ->setParameter("ssoitem",$ssoitem);
-                
-                if($iditemcategory && $itemcategoryfilter) {
-                    $qb->andWhere("item.itemcategory=:itemcategory")
-                    ->setParameter("itemcategory",$itemcategoryfilter);
+        foreach($ssoitems as $ssoitem) {
+            $qb = $this->getEntityManager()->createQueryBuilder();
+            $qb->select('item')
+                ->from("CadolesPortalBundle:Item", 'item')
+                ->where("item.ssoitem=:ssoitem ")
+                ->setParameter("ssoitem",$ssoitem);
+            
+            if($iditemcategory && $itemcategoryfilter) {
+                $qb->andWhere("item.itemcategory=:itemcategory")
+                   ->setParameter("itemcategory",$itemcategoryfilter);
+            }
+
+            $itemsssoitems=$qb->getQuery()->getResult();
+            foreach($itemsssoitems as $itemssoitem) {
+                if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
+                    if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
+                        $items->add($itemssoitem);
                 }
 
-                $itemsssoitems=$qb->getQuery()->getResult();
-                foreach($itemsssoitems as $itemssoitem) {
-                    if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
-                        if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
-                            $items->add($itemssoitem);
-                    }
-
-                    if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
-                }
+                if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
             }
         }
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml

@@ -8,11 +8,7 @@ cadoles_portal_config_syncdelegation:
 cadoles_portal_config_syncbalado:
     path: /config/syncenvole/balado
     defaults: { _controller: CadolesPortalBundle:Syncenvole:balado }
-
-cadoles_portal_config_synccdt:
-    path: /config/syncenvole/cdt
-    defaults: { _controller: CadolesPortalBundle:Syncenvole:cdt }
-
+    
 cadoles_portal_config_syncgepiannu:
     path: /config/syncenvole/gepiannu
     defaults: { _controller: CadolesPortalBundle:Syncenvole:gepiannu }
@@ -117,10 +113,6 @@ cadoles_portal_config_item_order:
     path: /config/item/order
     defaults: { _controller: CadolesPortalBundle:Item:order }  
 
-cadoles_portal_config_item_forceorder:
-    path: /config/item/forceorder
-    defaults: { _controller: CadolesPortalBundle:Item:forceorder }  
-
 cadoles_portal_config_ajax_item_seleclist:
     path: /config/item/ajax/selectlist
     defaults: { _controller: CadolesPortalBundle:Item:ajaxseleclist }
@@ -167,13 +159,6 @@ cadoles_portal_config_alert_order:
     path: /config/alert/order
     defaults: { _controller: CadolesPortalBundle:Alert:order } 
 
-cadoles_portal_config_alert_upload:
-    path: /config/alert/upload
-    defaults: { _controller: CadolesPortalBundle:Alert:upload } 
-cadoles_portal_config_alert_upload_direct:
-    path: /config/alert/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Alert:upload } 
-
 cadoles_portal_config_ajax_alert_seleclist:
     path: /config/alert/ajax/selectlist
     defaults: { _controller: CadolesPortalBundle:Alert:ajaxseleclist }
@@ -336,9 +321,6 @@ cadoles_portal_config_page_order:
 cadoles_portal_config_page_upload:
     path: /config/page/upload
     defaults: { _controller: CadolesPortalBundle:Page:upload, access: config }  
-cadoles_portal_config_page_upload_direct:
-    path: /config/page/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Page:upload, access: config }  
 
 #-- Access user    
 cadoles_portal_user_page_submit:
@@ -368,9 +350,6 @@ cadoles_portal_user_page_order:
 cadoles_portal_user_page_upload:
     path: /user/page/upload
     defaults: { _controller: CadolesPortalBundle:Page:upload, access: user }  
-cadoles_portal_user_page_upload_direct:
-    path: /user/page/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Page:upload, access: user }
 
 # Page spécifique
 cadoles_portal_user_page_application:
@@ -552,10 +531,7 @@ cadoles_portal_config_blogarticle_delete:
 cadoles_portal_config_blogarticle_upload:
     path: /config/blogarticle/upload
     defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: config }    
-cadoles_portal_config_blogarticle_upload_direct:
-    path: /config/blogarticle/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: config }
-    
+
 cadoles_portal_config_blogarticle_image:
     path: /config/blogarticle/image
     defaults: { _controller: CadolesPortalBundle:Blogarticle:image, access: config } 
@@ -580,9 +556,6 @@ cadoles_portal_user_blogarticle_delete:
 cadoles_portal_user_blogarticle_upload:
     path: /user/blogarticle/upload
     defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: user } 
-cadoles_portal_user_blogarticle_upload_direct:
-    path: /user/blogarticle/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: user }
 
 cadoles_portal_user_blogarticle_image:
     path: /user/blogarticle/image
@@ -611,9 +584,6 @@ cadoles_portal_config_blogcomment_delete:
 cadoles_portal_config_blogcomment_upload:
     path: /config/blogcomment/upload
     defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: config }    
-cadoles_portal_config_blogcomment_upload_direct:
-    path: /config/blogcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: config }
 
 #-- Access user   
 cadoles_portal_user_blogcomment_submit:
@@ -635,9 +605,7 @@ cadoles_portal_user_blogcomment_delete:
 cadoles_portal_user_blogcomment_upload:
     path: /user/blogcomment/upload
     defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: user } 
-cadoles_portal_user_blogcomment_upload_direct:
-    path: /user/blogcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: user }
+
 
 #== CALENDAR =============================================================================================================================================
 
@@ -836,9 +804,6 @@ cadoles_portal_config_projecttask_delete:
 cadoles_portal_config_projecttask_upload:
     path: /config/projecttask/upload
     defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: config }    
-cadoles_portal_config_projecttask_upload_direct:
-    path: /config/projecttask/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: config }
 
 cadoles_portal_config_projecttask_users:
     path: /config/projecttask/users
@@ -868,9 +833,6 @@ cadoles_portal_user_projecttask_delete:
 cadoles_portal_user_projecttask_upload:
     path: /user/projecttask/upload
     defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: user } 
-cadoles_portal_user_projecttask_upload_direct:
-    path: /user/projecttask/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: user }
 
 cadoles_portal_user_projecttask_users:
     path: /user/projecttask/users
@@ -899,9 +861,6 @@ cadoles_portal_config_projectcomment_delete:
 cadoles_portal_config_projectcomment_upload:
     path: /config/projectcomment/upload
     defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: config }    
-cadoles_portal_config_projectcomment_upload_direct:
-    path: /config/projectcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: config }
 
 #-- Access user   
 cadoles_portal_user_projectcomment_submit:
@@ -919,9 +878,7 @@ cadoles_portal_user_projectcomment_delete:
 cadoles_portal_user_projectcomment_upload:
     path: /user/projectcomment/upload
     defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: user } 
-cadoles_portal_user_projectcomment_upload_direct:
-    path: /user/projectcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: user }
+
 
 #== FEED =================================================================================================================================================
 
@@ -973,9 +930,6 @@ cadoles_portal_config_pagewidget_order:
 cadoles_portal_config_pagewidget_upload:
     path: /config/pagewidget/upload
     defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: config }     
-cadoles_portal_config_pagewidget_upload_direct:
-    path: /config/pagewidget/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: config } 
 
 cadoles_portal_config_panelwidget_view_url:
     path: /config/pagewidget/view/url/{id}
@@ -1097,9 +1051,6 @@ cadoles_portal_user_pagewidget_order:
 cadoles_portal_user_pagewidget_upload:
     path: /user/pagewidget/upload
     defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: user }  
-cadoles_portal_user_pagewidget_upload_direct:
-    path: /user/pagewidget/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: user } 
 
 cadoles_portal_user_panelwidget_view_url:
     path: /pagewidget/view/url/{id}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Annonces = {{alert.title}}
+    Modification Annonces
     {% elseif mode=="submit" %}
     Création Annonces
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Catégorie d'Annonce = {{alertcategory.label}}
+    Modification Catégorie d'Annonce
     {% elseif mode=="submit" %}
     Création Catégorie d'Annonce
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Blog = {{entity.name}}
+    Modification Blog
     {% elseif mode=="submit" %}
     Création Blog
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Calendrier = {{entity.name}}
+    Modification Calendrier
     {% elseif mode=="submit" %}
     Création Calendrier
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/share.html.twig

@@ -3,7 +3,7 @@
 {% block pagewrapper %}
 {{ form_start(form) }}
     <h1>
-        Partage Calendrier = {{entity.name}}
+        Partage Calendrier
     </h1>
     
     <p>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Flux = {{flux.title}}
+    Modification Flux
     {% elseif mode=="submit" %}
     Création Flux
     {% endif %}
@@ -17,7 +17,7 @@
     <a href={{ path('cadoles_portal_config_flux_delete',{'id':flux.id}) }}
         class="btn btn-danger pull-right"
         data-method="delete" data-csrf="_token:{{ 'csrf' }}"
-        data-confirm="Êtes-vous sûr de vouloir supprimer ce flux ?">
+        data-confirm="Êtes-vous sûr de vouloir supprimer cette annonce ?">
           Supprimer
     </a>
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/dnma.html.twig

@@ -1,138 +0,0 @@
-<table class="table table-striped table-bordered table-hover dataTable no-footer">
-    <thead>
-        <tr>
-            <td>Libellé du service</td>
-            <td>Description</td>
-        </tr>
-    </thead>
-
-    <tr>
-        <td>ACCUEIL</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>ACTUALITES</td>
-        <td>Création ou publication d’actualités, publiques ou privées. Le marquage de ce service ne comprend pas l’accès en consultation à ces actualités, qu’elles soient publiques ou privées</td>
-    </tr>
-
-    <tr>
-        <td>CAHIER_TEXTES</td>
-        <td>Description du travail fait en classe par séquence, des points du programme abordés, des modalités pédagogiques utilisées…<br><br>Programmation du travail à faire en dehors de la classe (Devoirs).</td>
-    </tr>
-
-    <tr>
-        <td>CAHIER_LIAISON</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>COURRIER_ELECTRONIQUE</td>
-        <td>Courrier électronique, Carnet d'adresses, Annuaire, Liste de diffusion.</td>
-    </tr>
-
-    <tr>
-        <td>MESSAGERIE_INSTANTANEE</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>VISIOCONFERENCE</td>
-        <td>Services associés à l’organisation et l’animation de visioconférences.  </td>
-    </tr>
-
-    <tr>
-        <td>STOCKAGE_PARTAGE</td>
-        <td>Chargement, stockage de fichiers pouvant ou non être partagés avec d’autres utilisateurs</td>
-    </tr>
-
-    <tr>
-        <td>PRODUCTION_COLLABORATIVE</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>DOCUMENTATION_CDI</td>
-        <td>Accès au catalogue de ressources proposées par le CDI, consultation et gestion des ressources, prêts, …</td>
-    </tr>
-
-    <tr>
-        <td>PARCOURS_PEDAGOGIQUE</td>
-        <td>Utilisation des outils permettant la production de nouvelles ressources pédagogiques (LMS).</td>
-    </tr>
-
-    <tr>
-        <td>RESERVATION_SALLES_MATERIELS</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>SERVICE_COLLECTIVITE</td>
-        <td>Utilisation des services proposés par les collectivités aux établissements ou aux familles (Exemples : cantine, transports, bourses, …).</td>
-    </tr>
-
-    <tr>
-        <td>SERVICES_VIE_SCOLAIRE</td>
-        <td>Accès à des logiciels de vie scolaire ne permettant pas de marquer finement le type de services utilisés.</td>
-    </tr>
-
-    <tr>
-        <td>GESTION_TEMPS</td>
-        <td>Gestion de l’agenda et des tâches personnelles ou de groupe. Visualisation de l’emploi du temps.</td>
-    </tr>
-
-    <tr>
-        <td>ABSENCES</td>
-        <td>Saisie ou visualisation des absences.</td>
-    </tr>
-
-    <tr>
-        <td>GESTION_COMPETENCES</td>
-        <td>Mise à jour, validation ou visualisation de compétences.</td>
-    </tr>
-
-    <tr>
-        <td>NOTES</td>
-        <td>Saisie ou visualisation des notes (relevés de notes, bulletins).</td>
-    </tr>
-
-    <tr>
-        <td>MANUEL_NUMERIQUE</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_MULTIMEDIA</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_ORIENTATION</td>
-        <td>Accès aux contenus et services proposés dans le cadre des actions d’orientation.</td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_PRODUCTION</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_ACCOMPAGNEMENT_ENTRAINEMENT</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_REFERENCE_DICTIONNAIRE</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>RESSOURCE_DOCUMENTAIRE</td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td>PAGE_ENT</td>
-        <td></td>
-    </tr>                    
-</table>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Item = {{item.title}}
+    Modification Item
     {% elseif mode=="submit" %}
     Création Item
     {% endif %}
@@ -67,12 +67,6 @@
                 {{ form_row(form.ssoitem) }}
             {% endif %}
 
-            {% if form.clicksondeservice is defined %}
-                {{ form_label(form.clicksondeservice) }}
-                <a id="dnmainfo" type="button" class="btn btn-link" data-toggle="modal" data-target="#dnma" style="float:right"><i class="fa fa-info"></i></a>                
-                {{ form_widget(form.clicksondeservice) }}<br>
-            {% endif %}
-
             {{ form_row(form.color) }}
 
             <div id="diviconsel" class="col-md-12 text-left" style="height:140px; padding:20px; text-align:center; background-color: {{ item.color ? "#"~item.color : '#'~color['main'] }};">
@@ -89,23 +83,6 @@
         </div>
     </div>   
 {{ form_end(form) }}
-
-<div id="dnma" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title">Services</h4>
-            </div>
-
-            <div class="modal-body">
-                {{ include('@CadolesPortal/Item/dnma.html.twig') }}
-            </div>
-        </div>
-    </div>
-</div>
-
-
 {% endblock %}
 
 {% block localjavascript %}
@@ -117,10 +94,6 @@
         showhide();
     });
 
-    $('#item_clicksonde').change(function() {
-        showhide();
-    });
-
     function selIcon(idicon,label) {
         $("#item_idicon").val(idicon);
         $("#diviconsel img").remove();

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig

@@ -11,8 +11,6 @@
             <p>
                 <a href="{{ path('cadoles_portal_config_item_submit') }}" class="btn btn-success">Ajouter un Item</a>
                 <a href="{{ path('cadoles_portal_config_itemcategory_submit') }}" class="btn btn-success">Ajouter une Categorie</a>
-
-                <a href="{{ path('cadoles_portal_config_item_forceorder') }}" class="btn btn-success pull-right">Ordonner les items en alpha</a>
             </p>
 
             <div class="category-list">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Itemcategory/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Catégorie d'Item = {{itemcategory.label}}
+    Modification Catégorie d'Item
     {% elseif mode=="submit" %}
     Création Catégorie d'Item
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Charte = {{notice.title}}
+    Modification Charte
     {% elseif mode=="submit" %}
     Création Charte
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/application.html.twig

@@ -25,17 +25,12 @@
                                 <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
                                     <a  style="cursor:pointer" onClick="modBookmark({{ bookmark.id }})" class="item-update"><i style="color: #FFF" class="fa fa-file" title="Modifier le favori"></i></a>
 
-                                    {% set datasonde = "" %}
-                                    {% if bookmark.item and bookmark.item.clicksonde %}
-                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
-                                    {% endif %}
-
                                     {% if bookmark.target == 'frame' %}
-                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a {{datasonde|raw}} href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a {{datasonde|raw}} href="{{ bookmark.url }}" target="{{ bookmark.target }}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -115,17 +110,12 @@
                                 {% endif %}
                                 
                                 {% else %}
-                                    {% set datasonde = "" %}
-                                    {% if item.clicksonde %}
-                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
-                                    {% endif %}
-
                                     {% if item.target == 'frame' %}
-                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a {{datasonde|raw}} href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a {{datasonde|raw}} href="{{ item.url }}" target="{{ item.target }}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 
@@ -206,10 +196,9 @@
         // Sur click item à sonder
         {% if activate_widsonde %}
         $( ".linktosonde" ).click(function() {
-            title=$(this).attr("data-sondetitle");
-            service=$(this).attr("data-sondeservice");
-            EnvoleClickSondes($(this),title,service);
-        });         
+            title=$(this).attr("data-sonde");
+            //$.getScript( "{{ widsonde_url }}?appli="+title );
+        });        
         {% endif %}
 
     });

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/noportal.html.twig

@@ -26,11 +26,11 @@
                                     <a  style="cursor:pointer" onClick="modBookmark({{ bookmark.id }})" class="item-update"><i style="color: #FFF" class="fa fa-file" title="Modifier le favori"></i></a>
 
                                     {% if bookmark.target == 'frame' %}
-                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a href="{{ bookmark.url }}" target="{{ bookmark.target }}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -111,11 +111,11 @@
                                 
                                 {% else %}
                                     {% if item.target == 'frame' %}
-                                        <a style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a href="{{ item.url }}" target="{{ item.target }}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 
@@ -192,6 +192,15 @@
                 var grid = $('.grid').masonry(optiongrid);
             }
         });
+
+        // Sur click item à sonder
+        {% if activate_widsonde %}
+        $( ".linktosonde" ).click(function() {
+            title=$(this).attr("data-sonde");
+            //$.getScript( "{{ widsonde_url }}?appli="+title );
+        });        
+        {% endif %}
+
     });
 
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig

@@ -318,6 +318,49 @@
             loadmsgCounter()
         }, {{(app.session.get("timerefreshnotif")*1000)}});
         {% endif %}
+
+        // Init socket de counter
+        /* Désactiver car il semble préférable de faire un appel ajax régulier plutot qu'ouvrir un channel websocket
+        {% if websocket_activate %}
+            var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}";
+
+            var webSocket = WS.connect(_WS_URI);
+
+            webSocket.on("socket/connect", function (session) {          
+                // The callback function in "subscribe" is called everytime an event is published in that channel.
+                session.subscribe("websocket/counter", function (uri, payload) {
+                    if(payload.log) {
+                        console.log("Received message", payload.log);
+                    }
+                    if(payload.alert) {
+                        alert(payload.alert);
+                    }
+                    {% if app.user %}
+                    if(payload.from!="{{app.user.id}}") {
+                        menu=$("a[data-group='"+payload.group+"']");
+                        if(menu.length) {
+                            if(payload.add) {
+                                console.log("Ajout counter pour group "+payload.group+" by "+payload.from);
+                                if(menu.children(".badge").length) {
+                                menu.children(".badge").html(+(menu.children(".badge").html())+1);
+                                }
+                                else menu.append("<span id='badge-"+payload.group+"' class='badge'>1</span");
+                            }
+                        }                
+                    }
+                    {% endif %}
+                });
+
+                $(document).on('click', '#refreshcounter', function(){
+                    {% if app.user %}
+                    event=$(this).data("event");
+                    event.userid={{app.user.id}}
+                    session.publish("websocket/counter", event);
+                    {% endif %} 
+                });
+            });          
+        {% endif %}
+        */
     });
 
     $(window).resize(function() {

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateeditor.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Page Editeur = {{entity.name}}
+    Modification Page Editeur
     {% elseif mode=="submit" %}
     Création Page Editeur
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatetool.html.twig

@@ -3,7 +3,7 @@
 {% block pagewrapper %}
 {{ form_start(form) }}
     <h1 class="page-header">
-    Modification Page {{ entity.pagecategory.name}} = {{entity.name}}
+    Modification Page {{ entity.pagecategory.name}}
     </h1>
 
     <p>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Page URL = {{entity.name}}
+    Modification Page URL
     {% elseif mode=="submit" %}
     Création Page URL
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatewidget.html.twig

@@ -142,9 +142,9 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Page Widget = {{entity.name}}
+    Modification Page Widget
     {% elseif mode=="updatetemplate" %}
-    Modification Modèle de Page = {{entity.name}}
+    Modification Modèle de Page    
     {% elseif mode=="submit" %}
     Création Page Widget
     {% endif %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig

@@ -289,9 +289,8 @@
         // Sur click item à sonder
         {% if activate_widsonde %}
         $( ".linktosonde" ).click(function() {
-            title=$(this).attr("data-sondetitle");
-            service=$(this).attr("data-sondeservice");
-            EnvoleClickSondes($(this),title,service);
+            title=$(this).attr("data-sonde");
+            //$.getScript( "{{ widsonde_url }}?appli="+title );
         });        
         {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig

@@ -68,7 +68,7 @@
                         </div>
                     
                         <div class="panel-body">
-                            <div class="widget-ckeditor">{{ alert.content|raw }}</div>
+                            {{ alert.content|raw }}
 
                             {% if not alert.items is empty %}
                                 {% if app.user %}
@@ -95,11 +95,11 @@
                                                 
                                                 {% else %}
                                                     {% if item.target == 'frame' %}
-                                                        <a style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                                     {% elseif item.target == "_self" %}
-                                                        <a href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                                     {% else %}
-                                                        <a href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                                     {% endif %}
                                                 {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig

@@ -83,7 +83,7 @@
                                     
                         <div class="grid-item {{ stylegrid }}" data-idcategory="{{ item.itemcategory.id }}" data-iditem="{{ item.id }}">
                             <div class="grid-item-content" style="background-color: {{ item.color ? "#"~item.color : '#'~colormain }};">
-                                <a href="{{ item.url }}" target="_blank">
+                                <a class="linktosonde" data-sonde="{{ item.itemcategory.label }}" href="{{ item.url }}" target="_blank">
 
 
                                 <div class="item-link clearfix">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig

@@ -87,11 +87,11 @@
                                     {% endif %}
                                     
                                     {% if bookmark.target == 'frame' %}
-                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig

@@ -109,7 +109,7 @@
 
                     <div class="grid-item {{ stylegrid }}  feed flux-{{ feed.fluxid }}">
                         <div class="grid-item-content" style="{{ stylecolor }};">
-                            <a href="{{ feed.link }}" target="_blank">
+                            <a class="linktosonde" data-sonde="Flux = {{ feed.fluxtitle }}" href="{{ feed.link }}" target="_blank">
                                 <div class="item-link clearfix">
                                     {% if feed.image is not empty %}
                                     <div class="grid-item-logo">

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig

@@ -125,11 +125,11 @@
                                     <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                     {% if bookmark.target == 'frame' %}
-                                        <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                     {% elseif bookmark.target == "_self" %}
-                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                     {% else %}
-                                        <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                        <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                     {% endif %}
 
                                     <div class="item-link clearfix">
@@ -188,17 +188,12 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                 {% endif %}
 
-                                {% set datasonde = "" %}
-                                {% if bookmark.item and bookmark.item.clicksonde %}
-                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
-                                {% endif %}
-
                                 {% if bookmark.item.target == 'frame' %}
-                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a {{datasonde|raw}} data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                 {% else %}
-                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -249,17 +244,12 @@
                                         <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                         {% endif %}
 
-                                        {% set datasonde = "" %}
-                                        {% if bookmark.item and bookmark.item.clicksonde %}
-                                            {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
-                                        {% endif %}
-
                                         {% if bookmark.item.target == 'frame' %}
-                                            <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                         {% elseif bookmark.target == "_self" %}
-                                            <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                         {% else %}
-                                            <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                         {% endif %}
 
                                         <div class="item-link clearfix">
@@ -295,11 +285,11 @@
                                         <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                         {% if bookmark.target == 'frame' %}
-                                            <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                         {% elseif bookmark.target == "_self" %}
-                                            <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                         {% else %}
-                                            <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                            <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                         {% endif %}
 
                                         <div class="item-link clearfix">
@@ -404,17 +394,12 @@
                                 {% endif %}
                                 
                                 {% else %}
-                                    {% set datasonde = "" %}
-                                    {% if item.clicksonde %}
-                                        {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
-                                    {% endif %}
-
                                     {% if item.target == 'frame' %}
-                                        <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                     {% elseif item.target == "_self" %}
-                                        <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                     {% else %}
-                                        <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                        <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                     {% endif %}
                                 {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig

@@ -97,17 +97,12 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer des favoris"></i></a>
                                 {% endif %}
 
-                                {% set datasonde = "" %}
-                                {% if bookmark.item.clicksonde %}
-                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~bookmark.item.title~"' data-sondeservice='"~bookmark.item.clicksondeservice~"'" %}
-                                {% endif %}
-                                
                                 {% if bookmark.item.target == 'frame' %}
-                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.item.id }}','{{ bookmark.item.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.item.target }}{% endif %}">
                                 {% else %}
-                                    <a {{datasonde|raw}} href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.item.title }}" href="{{ bookmark.item.url|replace({'#login#': username}) }}" target="{{ bookmark.item.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -143,11 +138,11 @@
                                 <a  style="cursor:pointer"  onClick="delBookmark({{ bookmark.id }})"  class="item-heart"><i style="color: #FFF" class="fa fa-trash" title="Supprimer le favori"></i></a>
 
                                 {% if bookmark.target == 'frame' %}
-                                    <a style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" style="cursor:pointer" onClick="showFrameitem('bookmark{{ bookmark.id }}','{{ bookmark.url|replace({'#login#': username}) }}')">
                                 {% elseif bookmark.target == "_self" %}
-                                    <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ bookmark.target }}{% endif %}">
                                 {% else %}
-                                    <a href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
+                                    <a class="linktosonde" data-sonde="{{ bookmark.title }}" href="{{ bookmark.url|replace({'#login#': username}) }}" target="{{ bookmark.target }}">
                                 {% endif %}
 
                                 <div class="item-link clearfix">
@@ -191,17 +186,12 @@
                             {% endif %}
                             
                             {% else %}
-                                {% set datasonde = "" %}
-                                {% if item.clicksonde %}
-                                    {% set datasonde = "class='linktosonde' data-sondetitle='"~item.title~"' data-sondeservice='"~item.clicksondeservice~"'" %}
-                                {% endif %}
-
                                 {% if item.target == 'frame' %}
-                                    <a {{datasonde|raw}} style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
+                                    <a class="linktosonde" data-sonde="{{ item.title }}" style="cursor:pointer" onClick="showFrameitem({{ item.id }},'{{ item.url|replace({'#login#': username}) }}')">
                                 {% elseif item.target == "_self" %}
-                                    <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
+                                    <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ item.target }}{% endif %}">
                                 {% else %}
-                                    <a {{datasonde|raw}} href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
+                                    <a class="linktosonde" data-sonde="{{ item.title }}" href="{{ item.url|replace({'#login#': username}) }}" target="{{ item.target }}">
                                 {% endif %}
                             {% endif %}
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig

@@ -28,11 +28,11 @@
     <div class="widget widget-mini widget-link" data-id="{{ entity.id }}" loc="{{ entity.loc }}">
         <div class="widgetheader">
             {% if target == 'frame' %}
-                <a style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
             {% elseif target == "_self" %}
-                <a style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
             {% else %}
-                <a style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
             {% endif %}   
             {% if entity.icon %}
                 <img src="/{{ alias }}/{{ entity.icon.label }}" class="logo" title="{{entity.name}}" />
@@ -54,11 +54,11 @@
 
         <div class="widgetheader" style="{{ stylewidgetbodyimage }}; height:100%;">
             {% if target == 'frame' %}
-                <a style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="cursor:pointer; {{ stylelink }}" onClick="showFrameitem('link{{ entity.id }}','{{ url|replace({'#login#': username}) }}')">
             {% elseif target == "_self" %}
-                <a style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}"href="{{ url|replace({'#login#': username}) }}" target="{% if access=="user" %}_top{% else %}{{ target }}{% endif %}">
             {% else %}
-                <a style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
+                <a class="linktosonde" data-sonde="{{ entity.name }}" style="{{ stylelink }}" href="{{ url|replace({'#login#': username}) }}" target="{{ target }}">
             {% endif %}   
             {% if entity.icon %}
                 <img src="/{{ alias }}/{{ entity.icon.label }}" style="max-height: 100%; width: auto; display: block; margin: auto; padding-top: 10px;" />

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/edit.html.twig

@@ -4,7 +4,7 @@
 {{ form_start(form) }}
     <h1 class="page-header">
     {% if mode=="update" %}
-    Modification Projet = {{entity.name}}
+    Modification Projet
     {% elseif mode=="submit" %}
     Création Projet
     {% endif %}

src/ninegate-1.0/src/Cadoles/WebsocketBundle/Controller/ChatController.php

@@ -51,16 +51,12 @@ class ChatController extends Controller
             if(!$group) die();
 
             // Génération d'une clé temporaire d'accès au chat
+            $key = Uuid::uuid4();
             $usergroup=$em->getRepository("CadolesCoreBundle:UserGroup")->findOneBy(["group"=>$group,"user"=>$user]);
-            $key=null;
             if($usergroup) {
-                $key=$usergroup->getKeyvalue();
-                if(is_null($key)) {
-                    $key = Uuid::uuid4();
-                    $usergroup->setKeyvalue($key);
-                    $em->persist($usergroup);
-                    $em->flush();
-                }  
+                $usergroup->setKeyvalue($key);
+                $em->persist($usergroup);
+                $em->flush();
             }
 
 

src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php

@@ -30,7 +30,7 @@ class ChatType extends AbstractType
             'mapped'=> false,
             'required' => false,
             'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "100px"],
+            'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload',],
         ]);
         
         $builder
@@ -40,7 +40,7 @@ class ChatType extends AbstractType
             'mapped'=> false,
             'required' => false,
             'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "150px"]
+            'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
         ]);
     }
 

src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig

@@ -362,8 +362,7 @@
 
         function websocket()
         {       
-            var _WS_URI = "wss://{{ gos_web_socket_server_host }}";
-            console.log(_WS_URI);
+            var _WS_URI = "wss://{{ gos_web_socket_server_host }}:{{ gos_web_socket_server_port }}";
             webSocket = WS.connect(_WS_URI,{retryDelay: delayRetry});
 
             webSocket.on("socket/connect", function (sess) {  

tmpl/ninegate-apache.conf

@@ -9,6 +9,23 @@ Alias /ninegate /var/www/html/ninegate/web
 </Directory>
 
 %if %%getVar("ninegate_activate_websocket", 'non') == "oui"
-ProxyPass /wssninegate ws://0.0.0.0:5556 retry=0 keepalive=On 
-ProxyPassReverse /wssninegate ws://0.0.0.0:5556 retry=0 
+Listen %%adresse_ip_eth0:%%ninegate_websocket_portexterne
+<VirtualHost %%adresse_ip_eth0:%%ninegate_websocket_portexterne>
+    ErrorLog /var/log/apache2/ssl_error.log
+    CustomLog /var/log/apache2/ssl_access.log common
+    SSLEngine on
+    %if %%cert_type == "letsencrypt"
+    SSLCertificateFile    /etc/ssl/letsencrypt/conf/live/%%ninegate_websocket_url/cert.pem
+    SSLCertificateKeyFile /etc/ssl/letsencrypt/conf/live/%%ninegate_websocket_url/privkey.pem
+    %else
+    SSLCertificateFile    %%server_cert
+    SSLCertificateKeyFile %%server_key
+    %end if
+    SSLProtocol all -SSLv3 -SSLv2
+    ServerName %%ninegate_websocket_url
+    RewriteEngine On
+  
+    ProxyPass / ws://%%adresse_ip_eth0:%%ninegate_websocket_portinterne retry=0 keepalive=On 
+    ProxyPassReverse / ws://%%adresse_ip_eth0:%%ninegate_websocket_portinterne retry=0 
+</VirtualHost>
 %end if

tmpl/ninegate-init-01.sql

@@ -67,12 +67,11 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (3000,	NULL,	3000,	'SYNCHRONISATION',      NULL,	                                    'fa fa-exchange-alt',       'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3001,	3000,	3001,	'Délégation',           'cadoles_portal_config_syncdelegation',     'fa fa-balance-scale',      'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3110,	3000,	3110,	'Balado',               'cadoles_portal_config_syncbalado',         'fa fa-microphone',         'ROLE_ADMIN,ROLE_MODO', 'widbalado_activate_syncenvole'),
-(3112,	3000,	3112,	'CdT',                  'cadoles_portal_config_synccdt',            'fa fa-star',               'ROLE_ADMIN,ROLE_MODO', 'widcdt_activate_syncenvole'),
 (3115,	3000,	3115,	'GEPI via Annuaire',    'cadoles_portal_config_syncgepiannu',       'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3116,	3000,	3116,	'GEPI via SIECLE',      'cadoles_portal_config_syncgepisiecle',     'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3120,	3000,	3120,	'Limesurvey',           'cadoles_portal_config_synclimesurvey',     'fa fa-question',           'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'),
 (3130,	3000,	3130,	'Moodle',               'cadoles_portal_config_syncmoodle',         'fa fa-graduation-cap',     'ROLE_ADMIN,ROLE_MODO', 'activate_widmoodle'),
-(3140,	3000,	3140,	'Nextcloud',            'cadoles_portal_config_syncnextcloud',      'fa fa-cloud',              'ROLE_ADMIN,ROLE_MODO', 'widnextcloud_activate_syncenvole'),
+(3140,	3000,	3140,	'Nexcloud',             'cadoles_portal_config_syncnextcloud',      'fa fa-cloud',              'ROLE_ADMIN,ROLE_MODO', 'widnextcloud_activate_syncenvole'),
 (3150,	3000,	3150,	'Sacoche via SIECLE',   'cadoles_portal_config_syncsacoche',        'fa fa-suitcase',           'ROLE_ADMIN,ROLE_MODO', 'widsacoche_activate_syncenvole'),
 (3160,	3000,	3160,	'Piwik',                'cadoles_portal_config_syncpiwik',          'fa fa-signal',             'ROLE_ADMIN,ROLE_MODO', 'widpiwik_activate_syncenvole'),
 (3230,	3000,	3230,	'Wordpress',            'cadoles_portal_config_syncwordpress',      'fab fa-wordpress',         'ROLE_ADMIN,ROLE_MODO', 'activate_widwordpress'),

tmpl/ninegate-nginx.conf

@@ -1,6 +0,0 @@
-    location /wssninegate {
-        proxy_pass https://%%container_ip_web;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }   

tmpl/ninegate-template.yml

@@ -52,8 +52,14 @@ parameters:
 %end if
 %if %%getVar("ninegate_activate_websocket", 'non') == "oui"    
     websocket_activate: true
+    websocket_host: %%ninegate_websocket_url
+    websocket_port: %%ninegate_websocket_portexterne
+    websocket_portinterne: %%ninegate_websocket_portinterne
 %else
     websocket_activate: false
+    websocket_host: %%web_url
+    websocket_port: 80
+    websocket_portinterne: 80 
 %end if
 %if %%getVar("ninegate_activate_portal", 'non') == "oui"    
     portal_activate: true
@@ -127,11 +133,6 @@ parameters:
 %else
     ldap_tls: false
 %end if
-
-%if %%getVar("ninegate_masteridentity", 'SQL') != "SQL"
-    ldap_user: %%ldap_reader
-    ldap_password: %%pwdreader("",%%ldap_reader_passfile)
-%else
 %if %%getVar("activer_admin_passfile", 'non') == "oui"
     %if %%getVar("ldap_writer", '') == ""
     ldap_user: cn=admin,o=gouv,c=fr
@@ -142,7 +143,6 @@ parameters:
 %else
     ldap_user: %%ldap_reader
     ldap_password: %%pwdreader("",%%ldap_reader_passfile)
-%end if
 %end if
     ldap_basedn: %%ldap_base_dn
 %if %%getVar("ninegate_ldaptype", 'LDAP') == "AD"
@@ -284,20 +284,6 @@ parameters:
     widbalado_activate_syncenvole: false
 %end if
 
-%if %%getVar("ninegate_activate_widcdt", 'non') == "oui" 
-    activate_widcdt: true
-    widcdt_url: %%ninegate_widcdt_url
-    %if %%getVar("poshprofil_typesynchro", "") == "ENT"
-    widcdt_activate_syncenvole: true
-    widcdt_syncenvole: %%ninegate_widcdt_syncenvole  
-    %else
-    widcdt_activate_syncenvole: false
-    %end if      
-%else 
-    activate_widcdt: false
-    widcdt_activate_syncenvole: false
-%end if
-
 %if %%getVar("ninegate_activate_widdokuwiki", 'non') == "oui" 
     activate_widdokuwiki: true
     widdokuwiki_url: %%ninegate_widdokuwiki_url

tmpl/ninegate.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Ninegate websocket server
-After=local-fs.target network.target
-
-[Service]
-Type=simple
-ExecStart=/var/www/html/ninegate/bin/console gos:websocket:server --port 5556 -a 0.0.0.0 --no-debug -n -q --env=prod
-Restart=on-watchdog
-
-[Install]
-WantedBy=multi-user.target