From 80c2207a073cdc0b8c8f458426b8db76e0e9ee74 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Thu, 6 Jun 2019 16:37:34 +0200
Subject: [PATCH] svg

---
 dicos/90_ninegate.xml                         |   2 +
 .../CoreBundle/Command/SynchroCommand.php     |  63 ++
 .../CoreBundle/Command/data/core-init-01.sql  |  10 +-
 .../CoreBundle/Resources/public/css/style.css |  19 +-
 .../CronBundle/Command/InitDataCommand.php    |  14 +-
 .../Command/GetLimesurveyCommand.php          |  88 ++-
 .../PortalBundle/Command/InitDataCommand.php  | 593 +++++++++---------
 .../Controller/FeedController.php             | 291 +++++++++
 .../Controller/PagewidgetController.php       | 193 +++++-
 .../PortalBundle/Entity/Appexternal.php       |  71 +++
 .../src/Cadoles/PortalBundle/Entity/Flux.php  |   7 +
 .../Cadoles/PortalBundle/Form/FluxType.php    |   2 +-
 .../PortalBundle/Form/PagewidgetType.php      |  20 +
 .../PortalBundle/Resources/config/routing.yml |  15 +
 .../Resources/views/Feed/index.xml.twig       |  37 ++
 .../Resources/views/Page/viewwidget.html.twig |  17 +-
 .../Pagewidget/viewappexternal.html.twig      |  95 +++
 .../views/Pagewidget/viewflux.html.twig       |  81 ++-
 .../Controller/DefaultController.php          |   4 +
 .../web/uploads/icon/icon_limesurvey.png      | Bin 0 -> 19159 bytes
 20 files changed, 1221 insertions(+), 401 deletions(-)
 create mode 100755 src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/FeedController.php
 create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Appexternal.php
 create mode 100755 src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Feed/index.xml.twig
 create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
 create mode 100644 src/ninegate-1.0/web/uploads/icon/icon_limesurvey.png

diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml
index d7fcd47e..0cb1c37c 100644
--- a/dicos/90_ninegate.xml
+++ b/dicos/90_ninegate.xml
@@ -27,6 +27,8 @@
             <variable name="activer_moodle" type="oui/non" description="Activer Moodle" hidden='True' exists='False'>
                 <value>non</value>
             </variable>
+            <variable name='moodle_apikey' type='string' description="API Key pour accéder au webservice Moodle"  hidden='True' exists='False' />
+
             <variable name="activer_wordpress" type="oui/non" description="Activer Wordpress" hidden='True' exists='False'>
                 <value>non</value>
             </variable>
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php
index 3b8e680b..f8266e82 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php
@@ -384,6 +384,69 @@ class SynchroCommand extends Command
                 if(!$simulate) $ldap->addGroupUser($data);
             }   
             
+            $this->writeln('');
+            $this->writeln('== USER NIVEAU01 =======================================');
+            $baseniveau01 = $this->container->getParameter('ldap_baseniveau01');
+
+            $datas = $this->em
+                    ->createQueryBuilder()
+                    ->select('table')
+                    ->from('CadolesCoreBundle:Niveau01','table')
+                    ->getQuery()
+                    ->getResult();
+            foreach($datas as $data) {
+                $criteria = '(cn='.$data->getLabel().')';
+                $subbranch=$baseniveau01;
+                $results = $ldap->search($criteria, array('cn'), $subbranch);
+    
+                // Mise à jour des membres du groupes
+                if(count($results) > 0) {
+                    $this->writeln('    - '.$data->getLabel());
+                    $dn=$ldap->getNiveau01DN($data->getLabel());
+                    $attrs["memberuid"]=array();
+                    $attrs["cadolesMember"]=array();
+
+                    foreach($data->getUsers() as $userniveau01) {
+                        array_push($attrs["memberuid"],$userniveau01->getUsername());
+                        array_push($attrs["cadolesMember"],$ldap->getUserDN($userniveau01));
+                        $this->writeln('        > '.$userniveau01->getUsername());
+                    }
+                    if(!$simulate) $ldap->ldapModify($dn, $attrs);
+                }
+            }
+
+            $this->writeln('');
+            $this->writeln('== USER NIVEAU02 =======================================');
+            $baseniveau02 = $this->container->getParameter('ldap_baseniveau02');
+
+            $datas = $this->em
+                    ->createQueryBuilder()
+                    ->select('table')
+                    ->from('CadolesCoreBundle:Niveau02','table')
+                    ->getQuery()
+                    ->getResult();
+            foreach($datas as $data) {
+                $criteria = '(cn='.$data->getLabel().')';
+                $subbranch=$baseniveau02;
+                $results = $ldap->search($criteria, array('cn'), $subbranch);
+    
+                // Mise à jour des membres du groupes
+                if(count($results) > 0) {
+                    $this->writeln('    - '.$data->getLabel());
+                    $dn=$ldap->getNiveau02DN($data->getLabel());
+                    $attrs["memberuid"]=array();
+                    $attrs["cadolesMember"]=array();
+
+                    foreach($data->getUsers() as $userniveau01) {
+                        array_push($attrs["memberuid"],$userniveau01->getUsername());
+                        array_push($attrs["cadolesMember"],$ldap->getUserDN($userniveau01));
+                        $this->writeln('        > '.$userniveau01->getUsername());
+                    }
+                    if(!$simulate) $ldap->ldapModify($dn, $attrs);
+                }
+            }
+
+
             $this->writeln('');
             $this->writeln('== USER GROUP =======================================');
             $baseGroup = $this->container->getParameter('ldap_basegroup');
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
index 8905e90a..392383a6 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
@@ -8,8 +8,8 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
 (-100, 'DRAAF', '130007107');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}7o+kc3a8dmiDmMuVU1ti+CXx30Pt9fWd
-', 'admin@transnum.cadol.es', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}m0Uhk7yyXr8ha3c/7sugfU5RJVTQ1nYp
+', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 
 
@@ -72,6 +72,6 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type
 ('060', 1, 1, 1, 'font', 			'fontfacetitle',    'Anton-Regular',											'',				'Police des titres de votre site'),
 ('061', 1, 1, 1, 'font', 			'fontfacebody',     'Helvetica',				    						    '',				'Police des titres de votre site'),
 
-('200', 1, 0, 1, 'boolean',			'PROXYactivate',	'0',														'',             'Définit un Proxy'),
-('201', 1, 0, 1, 'string', 			'PROXYserver',		'',															'PROXYactivate','Adresse du Proxy'),
-('202', 1, 0, 1, 'string', 			'PROXYport',		'',															'PROXYactivate','Port du Proxy');
+('200', 1, 0, 1, 'boolean', 		'PROXYactivate',	'1',														'',             'Définit un Proxy'),
+('201', 1, 0, 1, 'string', 			'PROXYserver',		'192.168.57.160',									'PROXYactivate','Adresse du Proxy'),
+('202', 1, 0, 1, 'string', 			'PROXYport',		'8080',										'PROXYactivate','Port du Proxy');
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
index f8b4514f..2a368d46 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
@@ -397,6 +397,7 @@ a.item-heart {
 
 .grid .grid-preview  {
     width:19.2%;
+    min-width:220px;
     height:auto;
     margin-bottom: 10px;
     text-align: left;
@@ -408,8 +409,9 @@ a.item-heart {
 
 .grid .grid-preview .grid-preview-title {
     margin:0px;
-    font-size:25px;
+    font-size:20px;
     text-align:left;
+    word-wrap: break-word;
 }
 
 .grid .grid-preview .caption { padding: 9px }
@@ -527,23 +529,10 @@ a.item-heart {
     padding: 8px;
     margin-top: 10px;
     margin-right: 5px;   
+    margin-bottom: 10px;
     cursor:pointer;     
 }
 
-.feed{
-    height:200px;
-    padding: 10px;
-    overflow: hidden;
-}
-
-.feed h1 {
-    margin:0px;
-    font-size: 20px;
-    color: #fff;
-    background-color: rgba(0, 0, 0, 0.6);
-    padding:10px;
-}
-
 .feed .description {
     width: 70%;
     float: right;
diff --git a/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php
index 284b6a96..51d5ed4e 100644
--- a/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php
@@ -59,6 +59,12 @@ class InitDataCommand extends ContainerAwareCommand
             $this->entityManager->persist($entity);
         }
 
+
+        // afin de forcer les ID sur certaines entités
+        $metadata = $this->entityManager->getClassMetaData(get_class($entity));
+        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+        $metadata->setIdGenerator(new AssignedGenerator());
+                
         // Job synchronisation des comptes utilisateur
         // Toute les 24h à 3h00
         $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(100);
@@ -130,7 +136,7 @@ class InitDataCommand extends ContainerAwareCommand
             $entity->setNextexecdate($entity->getSubmitdate());
             $this->entityManager->persist($entity);
         }
-        elseif($entity) {
+        elseif($entity&&!($portal_activate||$calendar_activate)) {
             $this->entityManager->remove($entity);
         }
 
@@ -152,14 +158,10 @@ class InitDataCommand extends ContainerAwareCommand
             $entity->setNextexecdate($nextdate);
             $this->entityManager->persist($entity);
         }
-        elseif($entity) {
+        elseif($entity&&!$activate_widlimesurvey) {
             $this->entityManager->remove($entity);
         }
 
-        // afin de forcer les ID sur certaines entités
-        $metadata = $this->entityManager->getClassMetaData(get_class($entity));
-        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
-        $metadata->setIdGenerator(new AssignedGenerator());
 
         $this->entityManager->flush();
     }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
index db2d15ec..ce71e24d 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
@@ -354,7 +354,7 @@ class GetLimesurveyCommand extends Command
         $this->em           = $this->container->get('doctrine')->getEntityManager();
         $this->output       = $output;
         $this->filesystem   = new Filesystem();
-        $this->rootlog      = $this->container->get('kernel')->getRootDir()."/../var/logs/";
+        $this->rootfile     = $this->container->get('kernel')->getRootDir()."/../uploads/limesurvey";
         $alias              = $this->container->getParameter('alias');
 
         $activate_widlimesurvey = $this->container->getParameter('activate_widlimesurvey');
@@ -388,7 +388,13 @@ class GetLimesurveyCommand extends Command
         // Connection Limesurvey
         $sessionKey= $myJSONRPCClient->get_session_key( $widlimesurvey_apiuser, $widlimesurvey_apikey );        
 
-        // list de l'ensemble des sondages
+        // Filesystem
+        $fs = new Filesystem();
+
+        // On supprime les potentiels yml.new restant
+        $fs->remove($this->rootfile.'-new');
+
+        // list de l'ensemble des sondages invité
         $surveys= $myJSONRPCClient->list_surveys($sessionKey);
         foreach($surveys as $survey) {
             // Si le sondage est actif
@@ -401,32 +407,78 @@ class GetLimesurveyCommand extends Command
                 
                 foreach($users as $user) {
                     if(isset($user["participant_info"]["email"]) && $user["participant_info"]["email"]!="") {
-                        $q = "SELECT * FROM ".$config["dbprefixe"]."user WHERE user_email=?";
-                        $query=$bdd01->prepare($q);
-                        if(isset($user["participant_info"]["email"])) {
-                            $query->execute(array($user["participant_info"]["email"]));
-                            if($row=$query->fetch()){	
-                                /*
-                                $myfile = fopen($config['localdirectory']."/local/limesurvey/".$row["user_id"].".html", "a");
-                                $token=$user["token"];
-                                $url=$widlimesurvey_url."/".$survey_id;
-                                if($token!="")
-                                    $url.="?token=".$token;
+                        $entity = $this->em->getRepository('CadolesCoreBundle:User')->findOneBy(["email"=>$user["participant_info"]["email"]]);
+                        if($entity) {
+                            $surveypropconf = $myJSONRPCClient->get_survey_properties($sessionKey,$survey["sid"],["datecreated"]);
+                            $surveyproplang = $myJSONRPCClient->get_language_properties($sessionKey,$survey["sid"],["surveyls_welcometext"]);
+                            $surveydescription = $surveyproplang["surveyls_welcometext"];
+                            $surveydescription=str_replace("\r","",str_replace("\n","",$surveydescription));
                             
-                                fwrite($myfile,"<a href='".$url."' target='blank'>".$survey["surveyls_title"]."</a><br>");
-                                fclose($myfile);
-                                */
-                            }
+                            $token=$user["token"];
+                            $url=$widlimesurvey_url."/".$survey_id;
+                            if($token!="")
+                                $url.="?token=".$token;
+
+                            $string ='"'.$survey["sid"].'": {';
+                            $string.='"title": "'.$survey["surveyls_title"].'",';
+                            $string.='"url": "'.$url.'",';
+                            $string.='"date": "'.$surveypropconf["datecreated"].'",';
+                            $string.='"description": "'.$surveydescription.'"';
+                            $string.='},';
+
+                            $this->filesystem->appendToFile($this->rootfile.'-new/'.$entity->getId().'/invitation.json', $string."\n");
                         }
                     }
                 }
             }
         }
-        
+
+        // Pour chaque user on remonte les sondages dont ils sont propriétaires
+        $userlimesurveys=$myJSONRPCClient->list_users($sessionKey);
+        foreach($userlimesurveys as $userlimesurvey) {
+            $user = $this->em->getRepository('CadolesCoreBundle:User')->findOneBy(["username"=>$userlimesurvey["users_name"]]);
+            if($user) {
+                $surveys = $myJSONRPCClient->list_surveys($sessionKey, $user->getUserName());
+                foreach($surveys as $survey) {
+                    if(is_array($survey)) {
+                        
+                        if($survey["active"]=="Y") {
+                            $surveypropconf = $myJSONRPCClient->get_survey_properties($sessionKey,$survey["sid"],["datecreated"]);
+                            $surveyproplang = $myJSONRPCClient->get_language_properties($sessionKey,$survey["sid"],["surveyls_welcometext"]);
+                            $surveydescription = $surveyproplang["surveyls_welcometext"];
+                            $surveydescription=str_replace("\r","",str_replace("\n","",$surveydescription));
+
+                            $url=$widlimesurvey_url."/admin/survey/sa/view/surveyid/".$survey["sid"];
+
+                            $string ='"'.$survey["sid"].'": {';
+                            $string.='"title": "'.$survey["surveyls_title"].'",';
+                            $string.='"url": "'.$url.'",';
+                            $string.='"date": "'.$surveypropconf["datecreated"].'",';
+                            $string.='"description": "'.$surveydescription.'"';
+                            $string.='},';
+
+                            $this->filesystem->appendToFile($this->rootfile.'-new/'.$user->getId().'/survey.json', $string."\n");
+                        }
+                    }
+                }
+            }
+        }
+
+        // On supprime les encours pour le remplacer le new
+        $fs->remove($this->rootfile);
+        $fs->rename($this->rootfile.'-new',$this->rootfile);
         
         // release the session key
         $myJSONRPCClient->release_session_key( $sessionKey );        
 
+        // essai
+        /*
+        $essai=file_get_contents($this->rootfile.'/-100/survey.json');
+        $json = substr($essai, 0, -2);  // sup dernier ,
+        $decodedArray = json_decode("{".$json."}", true);
+        dump($decodedArray);
+        */
+
         $this->writeln('');
         return 1;
     }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
index 19ff8598..c86eca72 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
@@ -15,6 +15,8 @@ use Doctrine\ORM\Id\AssignedGenerator;
 use Cadoles\PortalBundle\Entity\Icon;
 use Cadoles\PortalBundle\Entity\Pagecategory;
 use Cadoles\PortalBundle\Entity\Widget;
+use Cadoles\PortalBundle\Entity\Appexternal;
+use Cadoles\PortalBundle\Entity\Flux;
 
 class InitDataCommand extends ContainerAwareCommand
 {
@@ -30,10 +32,37 @@ class InitDataCommand extends ContainerAwareCommand
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $em = $this->getContainer()->get('doctrine')->getEntityManager();
-
+        $alias =$this->getContainer()->getParameter('alias');
+        $activate_widlimesurvey =$this->getContainer()->getParameter('activate_widlimesurvey');
         
         $output->writeln('PORTAL = Default Data');
 
+        // afin de forcer les ID sur certaines entités
+        $metadata = $em->getClassMetaData('CadolesPortalBundle:Flux');
+        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+        $metadata->setIdGenerator(new AssignedGenerator());
+
+        $metadata = $em->getClassMetaData('CadolesPortalBundle:Pagecategory');
+        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+        $metadata->setIdGenerator(new AssignedGenerator());
+
+        $metadata = $em->getClassMetaData('CadolesPortalBundle:Widget');
+        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+        $metadata->setIdGenerator(new AssignedGenerator());
+
+        // Création appexternal
+        $entity = $em->getRepository('CadolesPortalBundle:Appexternal')->findoneby(["name"=>"Limesurvey"]);
+        if(!$entity&&$activate_widlimesurvey) {
+            $entity=new Appexternal;
+            $entity->setName("Limesurvey");
+            $em->persist($entity);
+            $em->flush();
+        }
+        elseif($entity&&!$activate_widlimesurvey) {
+            $em->remove($entity);
+            $em->flush();  
+        }
+
         // Creation des icons
         $output->writeln('  > Creation Icons');
 		$finder = new Finder();
@@ -50,6 +79,27 @@ class InitDataCommand extends ContainerAwareCommand
         }
         $em->flush();
 
+        // Création des Flux
+        $entityFlux = $em->getRepository('CadolesPortalBundle:Flux')->find(-2000);
+        if(!$entityFlux&&($activate_widlimesurvey)) {
+            $entityFlux = new Flux();
+            $entityFlux->setRowOrder(0);
+            $entityFlux->setColor("328637");
+        }
+        elseif($entityFlux&&!($activate_widlimesurvey)) {
+            $em->remove($entityFlux);
+            $em->flush();            
+            $entityWidget=null;
+        }
+        if($entityFlux) {
+            $entityFlux->setId(-2000);
+            $entityFlux->setTitle("Limesurvey");
+            $entityFlux->setUrl("/".$alias."/feed/limesurvey/##userid##");
+            $entityFlux->setMaxread(0);
+            $em->persist($entityFlux);
+            $em->flush();
+        }
+
         // Creation des pagecategory
         $output->writeln('  > Creation Pagecategory');
         $entityPagecategory = $em->getRepository('CadolesPortalBundle:Pagecategory')->find(-100);
@@ -90,368 +140,327 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityPagecategory);
         }  
 
+
+
         // Widget URL
         $output->writeln('  > Creation Widget');
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-2000);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_ribbon.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_ribbon.png"]);
+        $entityWidget->setId(-2000);
+        $entityWidget->setRoworder(1);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('URL');
+        $entityWidget->setDescription("Affiche le contenu d'une url");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_url");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(false);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL", "value": "", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-2000);
-            $entityWidget->setRoworder(1);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('URL');
-            $entityWidget->setDescription("Affiche le contenu d'une url");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_url");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(false);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL", "value": "", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }         
 
         // Widget Bureau
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1990);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_computer.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_computer.png"]);
+        $entityWidget->setId(-1990);
+        $entityWidget->setRoworder(2);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Bureau');
+        $entityWidget->setDescription("Affiche vos items de bureau");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_item");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"},{"id": "withbookmark", "loc": "col1", "type": "withbookmark", "label": "Avec Favoris", "value": "0", "mandatory": "true"},{"id": "itemcategory", "loc": "col1", "type": "itemcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1990);
-            $entityWidget->setRoworder(2);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Bureau');
-            $entityWidget->setDescription("Affiche vos items de bureau");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_item");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"},{"id": "withbookmark", "loc": "col1", "type": "withbookmark", "label": "Avec Favoris", "value": "0", "mandatory": "true"},{"id": "itemcategory", "loc": "col1", "type": "itemcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        } 
 
         // Widget Annonce
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1980);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_megaphone.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_megaphone.png"]);
+        $entityWidget->setId(-1980);
+        $entityWidget->setRoworder(3);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Annonces');
+        $entityWidget->setDescription("Affiche vos annonces");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_alert");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "alertcategory", "loc": "col1", "type": "alertcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1980);
-            $entityWidget->setRoworder(3);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Annonces');
-            $entityWidget->setDescription("Affiche vos annonces");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_alert");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "alertcategory", "loc": "col1", "type": "alertcategory", "label": "Catégorie Affichée", "value": "", "mandatory": "false"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }        
 
         // Widget Flux
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1970);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rss.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rss.png"]);
+        $entityWidget->setId(-1970);
+        $entityWidget->setRoworder(4);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Flux');
+        $entityWidget->setDescription("Affiche vos flux RSS");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_flux");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": []}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1970);
-            $entityWidget->setRoworder(4);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Flux');
-            $entityWidget->setDescription("Affiche vos flux RSS");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_flux");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": []}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        } 
 
         // Widget Favoris
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1960);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_star.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_star.png"]);
+        $entityWidget->setId(-1960);
+        $entityWidget->setRoworder(5);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Favoris');
+        $entityWidget->setDescription("Création de Favoris");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_bookmark");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1960);
-            $entityWidget->setRoworder(5);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Favoris');
-            $entityWidget->setDescription("Création de Favoris");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_bookmark");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        } 
 
         // Widget Liens
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1950);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_bolt.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_bolt.png"]);
+        $entityWidget->setId(-1950);
+        $entityWidget->setRoworder(6);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Lien');
+        $entityWidget->setDescription("Création d'un Lien");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_link");
+        $entityWidget->setHeight("200");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL", "value": "", "mandatory": "true"},{"id": "target", "loc": "col1", "type": "target", "label": "Ouvrir le lien dans", "value": "0", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1950);
-            $entityWidget->setRoworder(6);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Lien');
-            $entityWidget->setDescription("Création d'un Lien");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_link");
-            $entityWidget->setHeight("200");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL", "value": "", "mandatory": "true"},{"id": "target", "loc": "col1", "type": "target", "label": "Ouvrir le lien dans", "value": "0", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }         
 
         // Widget Editor
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1940);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_compose.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_compose.png"]);
+        $entityWidget->setId(-1940);
+        $entityWidget->setRoworder(7);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Editeur');
+        $entityWidget->setDescription("Votre propre texte à éditer");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_editor");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "html", "loc": "col5", "type": "ckeditor", "label": "Texte", "value": "", "mandatory": "false"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1940);
-            $entityWidget->setRoworder(7);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Editeur');
-            $entityWidget->setDescription("Votre propre texte à éditer");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_editor");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "html", "loc": "col5", "type": "ckeditor", "label": "Texte", "value": "", "mandatory": "false"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }  
 
         // Widget Carrousel
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1930);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_easel.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_easel.png"]);
+        $entityWidget->setId(-1930);
+        $entityWidget->setRoworder(8);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Carrousel');
+        $entityWidget->setDescription("Carrousel d'images");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_slide");
+        $entityWidget->setHeight("400");
+        $entityWidget->setAutoajust(false);
+        $entityWidget->setBorder(false);
+        $parameter = json_decode('{"fields": [{"id": "interval", "loc": "col1", "type": "integer", "label": "Interval en seconde entre 2 images", "value": "5", "mandatory": "false"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1930);
-            $entityWidget->setRoworder(8);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Carrousel');
-            $entityWidget->setDescription("Carrousel d'images");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_slide");
-            $entityWidget->setHeight("400");
-            $entityWidget->setAutoajust(false);
-            $entityWidget->setBorder(false);
-
-            $parameter = json_decode('{"fields": [{"id": "interval", "loc": "col1", "type": "integer", "label": "Interval en seconde entre 2 images", "value": "5", "mandatory": "false"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        } 
 
         // Widget File
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1920);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_folder.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_folder.png"]);
+        $entityWidget->setId(-1920);
+        $entityWidget->setRoworder(9);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Fichiers');
+        $entityWidget->setDescription("Répertoire de fichiers");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_file");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": []}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1920);
-            $entityWidget->setRoworder(9);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Fichiers');
-            $entityWidget->setDescription("Répertoire de fichiers");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_file");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": []}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }         
 
         // Widget Galery
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1910);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_image.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_image.png"]);
+        $entityWidget->setId(-1910);
+        $entityWidget->setRoworder(10);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Galerie');
+        $entityWidget->setDescription("Galerie d'images");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_galery");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": []}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1910);
-            $entityWidget->setRoworder(10);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Galerie');
-            $entityWidget->setDescription("Galerie d'images");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_galery");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": []}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }  
 
         // Widget Calendrier
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1900);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_calendar.png"]);
-
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1900);
-            $entityWidget->setRoworder(11);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Calendrier');
-            $entityWidget->setDescription("Calendrier d'évènements");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_calendar");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "nbday", "loc": "col1", "type": "integer", "label": "Nombre de jours affichés", "value": "15", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }          
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_calendar.png"]);
+        $entityWidget->setId(-1900);
+        $entityWidget->setRoworder(11);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Calendrier');
+        $entityWidget->setDescription("Calendrier d'évènements");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_calendar");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "nbday", "loc": "col1", "type": "integer", "label": "Nombre de jours affichés", "value": "15", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
         // Widget Blog
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1890);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rocket.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rocket.png"]);
+        $entityWidget->setId(-1890);
+        $entityWidget->setRoworder(12);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Blog');
+        $entityWidget->setDescription("Les derniers articles publiés sur vos blogs");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_blog");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "nbarticle", "loc": "col1", "type": "integer", "label": "Nombre d\'articles affichés", "value": "10", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1890);
-            $entityWidget->setRoworder(12);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Blog');
-            $entityWidget->setDescription("Les derniers articles publiés sur vos blogs");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_blog");
-            $entityWidget->setHeight("630");
-            $entityWidget->setAutoajust(true);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "nbarticle", "loc": "col1", "type": "integer", "label": "Nombre d\'articles affichés", "value": "10", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }  
 
         // Widget RSS
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1880);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rss.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_rss.png"]);
+        $entityWidget->setId(-1880);
+        $entityWidget->setRoworder(13);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('RSS');
+        $entityWidget->setDescription("Afficher un flux RSS spécifique");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_rss");
+        $entityWidget->setHeight("630");
+        $entityWidget->setAutoajust(true);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL du Flux RSS", "value": "", "mandatory": "true"},{"id": "nbarticle", "loc": "col1", "type": "integer", "label": "Nombre d\'articles affichés (0 pour tout)", "value": "10", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1880);
-            $entityWidget->setRoworder(13);
+
+        // Widget Applications Externe
+        $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1870);
+        if(!$entityWidget&&($activate_widlimesurvey)) $entityWidget = new Widget();
+        elseif($entityWidget&&!($activate_widlimesurvey)) {
+            $pagewidgets=$entityWidget->getPagewidgets();
+            foreach($pagewidgets as $pagewidget) {
+                $em->remove($pagewidget);
+                $em->flush(); 
+            }
+            $em->remove($entityWidget);
+            $em->flush();            
+            $entityWidget=null;
+        }
+        if($entityWidget) {
+            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_frames.png"]);
+            $entityWidget->setId(-1870);
+            $entityWidget->setRoworder(14);
             $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('RSS');
-            $entityWidget->setDescription("Afficher un flux RSS spécifique");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_rss");
+            $entityWidget->setName('Applications Externe');
+            $entityWidget->setDescription("Afficher des informations provenant de vos applications");
+            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_appexternal");
             $entityWidget->setHeight("630");
             $entityWidget->setAutoajust(true);
             $entityWidget->setBorder(true);
 
-            $parameter = json_decode('{"fields": [{"id": "url", "loc": "col1", "type": "string", "label": "URL du Flux RSS", "value": "", "mandatory": "true"},{"id": "nbarticle", "loc": "col1", "type": "integer", "label": "Nombre d\'articles affichés", "value": "10", "mandatory": "true"}]}');
+            $parameter = json_decode('{"fields": [{"id": "modedesktop", "loc": "col1", "type": "desktopmode", "label": "Mode Affichage", "value": "0", "mandatory": "true"},{"id": "Applications", "loc": "col1", "type": "appexternal", "label": "Applications à affichier", "value": "", "mandatory": "false"}]}');
             $entityWidget->setParameter($parameter);
-
             $em->persist($entityWidget);
-        }  
+        }
 
         // Widget Séparateur
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1600);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_roadblock.png"]);
-
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1600);
-            $entityWidget->setRoworder(100);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Séparateur');
-            $entityWidget->setDescription("Widget graphique pour séparer les autres widgets");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_separator");
-            $entityWidget->setHeight("50");
-            $entityWidget->setAutoajust(false);
-            $entityWidget->setBorder(false);
-            $entityWidget->setColorbodyback("ffffff");
-
-            $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icone", "value": "0", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }  
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_roadblock.png"]);
+        $entityWidget->setId(-1600);
+        $entityWidget->setRoworder(100);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Séparateur');
+        $entityWidget->setDescription("Widget graphique pour séparer les autres widgets");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_separator");
+        $entityWidget->setHeight("50");
+        $entityWidget->setAutoajust(false);
+        $entityWidget->setBorder(false);
+        $entityWidget->setColorbodyback("ffffff");
+        $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icone", "value": "0", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
         // Widget Horloge
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1500);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_clock.png"]);
-
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1500);
-            $entityWidget->setRoworder(100);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Horloge');
-            $entityWidget->setDescription("Une simple horloge");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_clock");
-            $entityWidget->setHeight("200");
-            $entityWidget->setAutoajust(false);
-            $entityWidget->setBorder(true);
-
-            $parameter = json_decode('{"fields": [{"id": "clock", "loc": "col1", "type": "clock", "label": "Mode d\'affichage", "value": "0", "mandatory": "true"}]}');
-            $entityWidget->setParameter($parameter);
-
-            $em->persist($entityWidget);
-        }  
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_clock.png"]);
+        $entityWidget->setId(-1500);
+        $entityWidget->setRoworder(100);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Horloge');
+        $entityWidget->setDescription("Une simple horloge");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_clock");
+        $entityWidget->setHeight("200");
+        $entityWidget->setAutoajust(false);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": [{"id": "clock", "loc": "col1", "type": "clock", "label": "Mode d\'affichage", "value": "0", "mandatory": "true"}]}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
         // Widget Calculatrice
         $entityWidget = $em->getRepository('CadolesPortalBundle:Widget')->find(-1490);
-        if(!$entityWidget) {
-            $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_calculator.png"]);
+        if(!$entityWidget) $entityWidget = new Widget();
+        $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_calculator.png"]);
+        $entityWidget->setId(-1490);
+        $entityWidget->setRoworder(110);
+        $entityWidget->setIcon($entityicon);
+        $entityWidget->setName('Calculatrice');
+        $entityWidget->setDescription("Une simple calculatrice");
+        $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_calculator");
+        $entityWidget->setHeight("400");
+        $entityWidget->setAutoajust(false);
+        $entityWidget->setBorder(true);
+        $parameter = json_decode('{"fields": []}');
+        $entityWidget->setParameter($parameter);
+        $em->persist($entityWidget);
 
-            $entityWidget = new Widget();
-            $entityWidget->setId(-1490);
-            $entityWidget->setRoworder(110);
-            $entityWidget->setIcon($entityicon);
-            $entityWidget->setName('Calculatrice');
-            $entityWidget->setDescription("Une simple calculatrice");
-            $entityWidget->setRouteview("cadoles_portal_config_panelwidget_view_calculator");
-            $entityWidget->setHeight("400");
-            $entityWidget->setAutoajust(false);
-            $entityWidget->setBorder(true);
 
-            $parameter = json_decode('{"fields": []}');
-            $entityWidget->setParameter($parameter);
 
-            $em->persist($entityWidget);
-        }  
 
-        // afin de forcer les ID sur certaines entités
-        $metadata = $em->getClassMetaData(get_class($entityWidget));
-        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
-        $metadata->setIdGenerator(new AssignedGenerator());
-
-        $metadata = $em->getClassMetaData(get_class($entityPagecategory));
-        $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
-        $metadata->setIdGenerator(new AssignedGenerator());
 
         $em->flush();
         $output->writeln('');
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/FeedController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/FeedController.php
new file mode 100755
index 00000000..6415736b
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/FeedController.php
@@ -0,0 +1,291 @@
+<?php
+
+namespace Cadoles\PortalBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Filesystem\Filesystem;
+
+class FeedController extends Controller
+{
+    public function limesurveyAction($id)
+    {
+
+        $directory=$this->get('kernel')->getRootDir()."/../uploads/limesurvey/".$id;
+        $feeds=[];
+        $fs = new Filesystem();
+
+        $file=file_get_contents($directory."/invitation.json");
+        $json = substr($file, 0, -2);  // sup dernier ,
+        $surveys = json_decode("{".$json."}", true);
+        foreach($surveys as $id => $survey) {
+            array_push($feeds,[
+                "id"=>$id,
+                "title"=>$survey["title"],
+                "url"=>$survey["url"],
+                "date"=>$survey["date"],
+                "description"=>$survey["description"],
+                "category"=>"limesurvey"]);
+        }
+
+        $response = new Response($this->renderView('CadolesPortalBundle:Feed:index.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    public function userAction($login,$nb)
+    {
+
+        $session = new Session();
+        $illustrations=$this->getIllustrations($login,$nb);
+        $webzines=$this->getWebzines($login,$nb);
+
+        $feeds=array_merge($illustrations,$webzines);
+
+        $indice=array();
+    	foreach ($feeds as $key => $rowd) {
+    	       $indice[$key] = $rowd["feed_timestamp"];
+    	}
+    	array_multisort($indice, SORT_DESC, $feeds);
+        $feeds = array_slice($feeds, 0, $nb);
+
+        $response = new Response($this->renderView('MyAppWebzineBundle:Feed:home.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    public function illustrationAction($nb)
+    {
+
+        $session = new Session();
+        $illustrations=$this->getIllustrations("all",$nb);
+        $feeds=$illustrations;
+
+        $response = new Response($this->renderView('MyAppWebzineBundle:Feed:home.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    public function webzineAction($nb)
+    {
+
+        $session = new Session();
+        $webzines=$this->getWebzines("all",$nb);
+        $feeds=$webzines;
+
+        $response = new Response($this->renderView('MyAppWebzineBundle:Feed:home.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    public function albumAction($nb)
+    {
+
+        $session = new Session();
+        $albums=$this->getAlbums("all",$nb);
+        $feeds=$albums;
+
+        $response = new Response($this->renderView('MyAppWebzineBundle:Feed:home.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    public function kadavreskyAction($nb)
+    {
+
+        $session = new Session();
+        $kadavreskys=$this->getKadavreskys("all",$nb);
+        $feeds=$kadavreskys;
+
+        $response = new Response($this->renderView('MyAppWebzineBundle:Feed:home.xml.twig',array(
+            "feeds" => $feeds,
+        )));
+
+        $response->headers->set('Content-Type', 'application/xml; charset=utf-8');
+        return $response;
+    }
+
+    protected function getIllustrations($login,$nbmax)
+    {
+        $em = $this->getDoctrine()->getManager();
+        if($login=="all") {
+            $datas = $em->createQueryBuilder()
+                          ->select('feed','user')
+                          ->from("MyAppWebzineBundle:Illustration",  'feed')
+                          ->from("MyAppConfigBundle:User",  'user')
+                          ->where("feed.user=user.id")
+                          ->orderBY('feed.id','DESC')
+                          ->setMaxResults($nbmax)
+                          ->getQuery()
+                          ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+        }
+        else {
+            $datas = $em->createQueryBuilder()
+                          ->select('feed','user')
+                          ->from("MyAppWebzineBundle:Illustration",  'feed')
+                          ->from("MyAppConfigBundle:User",  'user')
+                          ->where("feed.user=user.id")
+                          ->andWhere("user.username=:login")
+                          ->orderBY('feed.id','DESC')
+                          ->setMaxResults($nbmax)
+                          ->setParameter("login", $login)
+                          ->getQuery()
+                          ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+        }
+
+        foreach($datas as $key=>$feed)
+        {
+            $datas[$key]["feed_type"]="illustration";
+            $datas[$key]["feed_url"]=$datas[$key]["feed_illustration"];
+            $datas[$key]["feed_timestamp"]=$datas[$key]["feed_submittime"]->getTimestamp();
+        }
+
+        return $datas;
+    }
+
+    protected function getWebzines($login,$nbmax)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        if($login=="all") {
+            $datas = $em->createQueryBuilder()
+                          ->select('feed','user')
+                          ->from("MyAppWebzineBundle:Webzine",  'feed')
+                          ->from("MyAppConfigBundle:User",  'user')
+                          ->where("feed.user=user.id")
+                          ->orderBY('feed.updatetime','DESC')
+                          ->setMaxResults($nbmax)
+                          ->getQuery()
+                          ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+        }
+        else {
+            $datas = $em->createQueryBuilder()
+                          ->select('feed','user')
+                          ->from("MyAppWebzineBundle:Webzine",  'feed')
+                          ->from("MyAppConfigBundle:User",  'user')
+                          ->where("feed.user=user.id")
+                          ->andWhere("user.username=:login")
+                          ->orderBY('feed.updatetime','DESC')
+                          ->setMaxResults($nbmax)
+                          ->setParameter("login", $login)
+                          ->getQuery()
+                          ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+        }
+
+        foreach($datas as $key=>$feed)
+        {
+          $datas[$key]["feed_type"]="webzine";
+          $datas[$key]["feed_submittime"]=$datas[$key]["feed_updatetime"];
+          $pages=$this->getPage($feed["feed_id"],$feed["feed_updatetime"]);
+          $datas[$key]["feed_url"]=$pages[0]["page_page"];
+          $datas[$key]["feed_id2"]=$pages[0]["page_id"];
+          $datas[$key]["feed_timestamp"]=$datas[$key]["feed_submittime"]->getTimestamp();
+        }
+
+        return $datas;
+    }
+
+    protected function getPage($idwebzine,$updatetime)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $datas = $em->createQueryBuilder()
+                      ->select('page')
+                      ->from("MyAppWebzineBundle:Page",  'page')
+                      ->where("page.webzine=:idwebzine")
+                      ->andWhere("page.submittime=:submittime")
+                      ->orderBY('page.roworder','ASC')
+                      ->setMaxResults(1)
+                      ->setParameter("idwebzine", $idwebzine)
+                      ->setParameter("submittime", $updatetime)
+                      ->getQuery()
+                      ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                      //->getResult();
+
+        return $datas;
+    }
+
+    protected function getAlbums($login,$nbmax)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $datas = $em->createQueryBuilder()
+                      ->select('feed','user')
+                      ->from("MyAppWebzineBundle:Album",  'feed')
+                      ->from("MyAppConfigBundle:User",  'user')
+                      ->where("feed.user=user.id")
+                      ->orderBY('feed.updatetime','DESC')
+                      ->setMaxResults($nbmax)
+                      ->getQuery()
+                      ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                      //->getResult();
+
+        foreach($datas as $key=>$feed)
+        {
+          $datas[$key]["feed_type"]="album";
+          $datas[$key]["feed_submittime"]=$datas[$key]["feed_updatetime"];
+          $photos=$this->getPhoto($feed["feed_id"],$feed["feed_updatetime"]);
+          $datas[$key]["feed_url"]=$photos[0]["photo_photo"];
+          $datas[$key]["feed_id2"]=$photos[0]["photo_id"];
+          $datas[$key]["feed_timestamp"]=$datas[$key]["feed_submittime"]->getTimestamp();
+        }
+
+        return $datas;
+    }
+
+    protected function getPhoto($idalbum,$updatetime)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $datas = $em->createQueryBuilder()
+                      ->select('photo')
+                      ->from("MyAppWebzineBundle:Photo",  'photo')
+                      ->where("photo.album=:idalbum")
+                      ->andWhere("photo.submittime=:submittime")
+                      ->orderBY('photo.roworder','ASC')
+                      ->setMaxResults(1)
+                      ->setParameter("idalbum", $idalbum)
+                      ->setParameter("submittime", $updatetime)
+                      ->getQuery()
+                      ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                      //->getResult();
+
+        return $datas;
+    }
+
+    protected function getKadavreskys($login,$nbmax)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $datas = $em->createQueryBuilder()
+                      ->select('feed')
+                      ->from("MyAppWebzineBundle:Kadavresky",  'feed')
+                      ->orderBY('feed.submittime','DESC')
+                      ->setMaxResults($nbmax)
+                      ->getQuery()
+                      ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                      //->getResult();
+
+        foreach($datas as $key=>$feed)
+        {
+          $datas[$key]["feed_type"]="kadavresky";
+          $datas[$key]["feed_url"]=$datas[$key]["feed_kadavresky"];
+          $datas[$key]["feed_timestamp"]=$datas[$key]["feed_submittime"]->getTimestamp();
+        }
+
+        return $datas;
+    }
+}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index e00cac07..503dae12 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -12,6 +12,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\File\File;
+use GuzzleHttp\Exception\RequestException;
 
 use Cadoles\PortalBundle\Entity\Pagewidget;
 use Cadoles\PortalBundle\Form\PagewidgetType;
@@ -645,32 +646,27 @@ class PagewidgetController extends Controller
             return (int) $first->getRowOrder() > (int) $second->getRowOrder() ? 1 : -1;
         });
         
-
-        // Connexion au client
-        $PROXYactivate = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue();
-        
-        if($PROXYactivate) {
-            $PROXYserver    = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
-            $PROXYport      = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();
-            $clientguzzle = new \GuzzleHttp\Client(array('proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
-        }
-        else
-          $clientguzzle = new \GuzzleHttp\Client();
-
-		$client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle);
-		$logger = new \Psr\Log\NullLogger();
-		$feedIo = new \FeedIo\FeedIo($client, $logger);
-
 		$feeds=array();
         $filesystem = new Filesystem();
 
 		foreach($fluxsordered as $flux) {
             // On regarde si le flux a été lu il y a peu
             $toregen=true;
-       
-            if($filesystem->exists('uploads/flux/flux-'.$flux->getId().'.txt')) {
+            $url=$flux->getUrl();
+
+            // Feed lié à un user interne
+            $filecache='uploads/flux/flux-'.$flux->getId().'.txt';
+            if(stripos($url,"##userid##")!==false) {
+                if($user) {
+                    $url=str_replace("##userid##",$user->getId(),$url);
+                    $filecache=$filecache='uploads/flux/flux-'.$user->getId()."-".$flux->getId().'.txt';
+                }
+            }
+
+            // Si le fichie cache existe
+            if($filesystem->exists($filecache)) {
                 // On récupère la date de modification du fichier
-                $timestampfile = filemtime('uploads/flux/flux-'.$flux->getId().'.txt');
+                $timestampfile = filemtime($filecache);
                 $datetimeFormat = 'Y-m-d H:i:s';
                 $datefile = new \DateTime();
                 $datefile->setTimestamp($timestampfile);
@@ -682,15 +678,45 @@ class PagewidgetController extends Controller
                 $now = new \DateTime();
                 if($datefile>=$now) {
                     $toregen=false;
-                    $backup = unserialize(file_get_contents('uploads/flux/flux-'.$flux->getId().'.txt'));
+                    $backup = unserialize(file_get_contents($filecache));
                     $feeds=array_merge($feeds,$backup);
                 }
             }
 
             // Si le fichier est trop ancien on relit le flus
             if($toregen) {
+                $PROXYactivate = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue();
+                $weburl=$this->getParameter('weburl');
+
+                if(stripos($url,"/")==0) {
+                    $url="https://".$weburl.$url;
+                    $PROXYactivate=false; 
+                }
+                if(stripos($url,"https://".$weburl)===0) $PROXYactivate=false; 
+                if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false; 
+                
+                if($PROXYactivate) {
+                    $PROXYserver    = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
+                    $PROXYport      = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();
+                    $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
+                }
+                else
+                    $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3));
+    
+                try {
+                    $clientguzzle->request('GET', $url);
+                } catch (RequestException $e) {
+                    if ($e->hasResponse()) {
+                        continue;
+                    }
+                }
+    
                 // On lit le flux rss
-                $result     = $feedIo->read($flux->getUrl());
+                $client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle);
+                $logger = new \Psr\Log\NullLogger();
+                $feedIo = new \FeedIo\FeedIo($client, $logger);
+                                
+                $result     = $feedIo->read($url);
                 $feedtitle  = $result->getFeed()->getTitle();
                 
                 
@@ -760,11 +786,11 @@ class PagewidgetController extends Controller
                     array_push($backup,$tmp);
 
                     $nbflux++;
-                    if($nbflux>=$flux->getMaxread()) break;
+                    if($nbflux>=$flux->getMaxread()&&$flux->getMaxread()>0) break;
                 }
                 
                 // On sauvegarde le résultat en fichier on rechargera son contenu que s'il n'a pas été lu depuis 30mn
-                $filesystem->dumpFile('uploads/flux/flux-'.$flux->getId().'.txt', serialize($backup));
+                $filesystem->dumpFile($filecache, serialize($backup));
             }
 		}
 
@@ -817,11 +843,19 @@ class PagewidgetController extends Controller
 
         // On regarde si le flux a été lu il y a peu
         $toregen=true;
+        $filecache=$filecache='uploads/flux/widget-'.$id.'.txt';
+        $user=$this->getUser();
+        if(stripos($url,"##userid##")!==false) {
+            if($user) {
+                $url=str_replace("##userid##",$user->getId(),$url);
+                $filecache=$filecache='uploads/flux/widget-'.$user->getId()."-".$id.'.txt';
+            }
+        }
 
         $filesystem = new Filesystem();
-        if($filesystem->exists('uploads/flux/widget-'.$id.'.txt')) {
+        if($filesystem->exists($filecache)) {
             // On récupère la date de modification du fichier
-            $timestampfile = filemtime('uploads/flux/widget-'.$id.'.txt');
+            $timestampfile = filemtime($filecache);
             $datetimeFormat = 'Y-m-d H:i:s';
             $datefile = new \DateTime();
             $datefile->setTimestamp($timestampfile);
@@ -833,7 +867,7 @@ class PagewidgetController extends Controller
             $now = new \DateTime();
             if($datefile>=$now) {
                 $toregen=false;
-                $feeds = unserialize(file_get_contents('uploads/flux/widget-'.$id.'.txt'));
+                $feeds = unserialize(file_get_contents($filecache));
             }
         }
 
@@ -841,14 +875,36 @@ class PagewidgetController extends Controller
         if($toregen) {
             // Connexion au client
             $PROXYactivate = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue();
-            
+            $weburl=$this->getParameter('weburl');
+            if(stripos($url,"/")==0) {
+                $url="https://".$weburl.$url;
+                $PROXYactivate=false; 
+            }
+            if(stripos($url,"https://".$weburl)===0) $PROXYactivate=false; 
+            if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false;              
+
             if($PROXYactivate) {
                 $PROXYserver    = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
                 $PROXYport      = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();
-                $clientguzzle = new \GuzzleHttp\Client(array('proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
+                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
             }
             else
-            $clientguzzle = new \GuzzleHttp\Client();
+                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3));
+
+            try {
+                $clientguzzle->request('GET', $url);
+            } catch (RequestException $e) {
+                if ($e->hasResponse()) {
+                    // Render
+                    $feeds=[];
+                    return $this->render($this->labelentity.':viewflux.html.twig', [
+                        'entity'        => $entity,
+                        'canupdate'     => $canupdate,
+                        'access'        => $access,
+                        'feeds'         => $feeds,
+                    ]);
+                }
+            }
 
             $client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle);
             $logger = new \Psr\Log\NullLogger();
@@ -856,12 +912,11 @@ class PagewidgetController extends Controller
 
             $feeds=array();
             
-
-
             // On lit le flux rss
             $result     = $feedIo->read($url);
             $feedtitle  = $result->getFeed()->getTitle();
             
+            
             // Pour chaque articles
             $nbflux=0;
             foreach ($result->getFeed() as $item) {
@@ -905,7 +960,7 @@ class PagewidgetController extends Controller
                         $imgurl=substr($imgurl,0,$imgend);
                     }
                 }
-
+                
                 // Garder le flux
                 array_push($feeds,array(
                     "feedtitle"		=> $feedtitle,
@@ -921,7 +976,7 @@ class PagewidgetController extends Controller
                     ));
 
                 $nbflux++;
-                if($nbflux>=$nbarticle) break;
+                if($nbflux>=$nbarticle&&$nbarticle>0) break;
             }
 
 
@@ -932,7 +987,7 @@ class PagewidgetController extends Controller
             array_multisort($libelle, SORT_DESC, $feeds);
 
             // On sauvegarde le résultat en fichier on rechargera son contenu que s'il n'a pas été lu depuis 30mn
-            $filesystem->dumpFile('uploads/flux/widget-'.$id.'.txt', serialize($feeds));
+            $filesystem->dumpFile($filecache, serialize($feeds));
         }
 
         // Render
@@ -1429,4 +1484,74 @@ class PagewidgetController extends Controller
             'access'        => $access,
         ]);
     }            
+
+    public function viewappexternalAction($id,$access="config") {
+        $em = $this->getDoctrine()->getManager();
+        $entity = $em->getRepository($this->labelentity)->find($id);
+        if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
+
+        // Permissions
+        if($access=="config") {
+            $canupdate = true;
+        }
+        else {
+            // On s'assure que l'utilisateur à la permission de voir
+            $page=$entity->getPage();
+            $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate);
+            if(!$cansee) throw $this->createNotFoundException('Permission denied');
+        }
+
+        // Récupération des paramétres du widget
+        $idappexternal=null;
+        foreach($entity->getParameter()["fields"] as $parameter) {
+            switch($parameter["id"]) {
+                case "appexternal":
+                    $idappexternal=$parameter["value"];
+                    break;
+                case "modedesktop":
+                    $modedesktop=$parameter["value"];
+                    break;                
+            }
+        }
+        
+        $user=$this->getUser();
+        $items=[];
+        $itemcategorys=[];
+        if($user) {
+            if($idappexternal) $appextenals=$em->getRepository("CadolesPortalBundle:Appexternal")->findBy(["id"=>$idappexternal]);
+            else  $appextenals=$em->getRepository("CadolesPortalBundle:Appexternal")->findAll();
+            foreach($appextenals as $appexternal) {
+                switch($appexternal->getName()) {
+                    case "Limesurvey":
+                        $category=["id"=>0,"label"=>"Limesurvey"];
+                        array_push($itemcategorys,$category);
+
+                        $directory=$this->get('kernel')->getRootDir()."/../uploads/limesurvey/".$user->getId();
+                        $files=[];
+                        $fs = new Filesystem();
+
+                        $file=file_get_contents($directory."/survey.json");
+                        $json = substr($file, 0, -2);  // sup dernier ,
+                        $surveys = json_decode("{".$json."}", true);
+                        foreach($surveys as $id => $survey) {
+                            array_push($items,["id"=>$id,"title"=>$survey["title"],"subtitle"=>"Sondage","url"=>$survey["url"],"itemcategory"=>$category,"color"=>"328637","icon"=>"icon_limesurvey.png"]);
+                        }
+
+                        break;
+                }
+            }
+        }
+
+        // Render
+        return $this->render($this->labelentity.':viewappexternal.html.twig', [
+            'entity'        => $entity,
+            'canadd'        => ($user),
+            'canupdate'     => $canupdate,
+            'modedesktop'   => $modedesktop,
+            'items'         => $items,
+            'itemcategorys' => $itemcategorys,
+            'access'        => $access,
+        ]);
+    }     
+
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Appexternal.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Appexternal.php
new file mode 100644
index 00000000..27265b70
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Appexternal.php
@@ -0,0 +1,71 @@
+<?php
+namespace Cadoles\PortalBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
+
+
+/**
+ * Widget
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="appexternal")
+ * @ORM\HasLifecycleCallbacks
+ */
+
+class Appexternal
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", length=100)
+     */
+    private $name;
+
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     *
+     * @return Appexternal
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php
index 8498a10a..199e1cf9 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php
@@ -75,6 +75,13 @@ class Flux
      */
     protected $groups;
 
+    
+    // A garder pour forcer l'id en init
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
 
 
     /**
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
index 231e4cf2..ca05184a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/FluxType.php
@@ -34,7 +34,7 @@ class FluxType extends AbstractType
             ])
 
             ->add('maxread', IntegerType::class, [
-                'label' => "Nombre d'Articles affiché"
+                'label' => "Nombre d'Articles affiché (0 pour tout)"
             ])
 
             ->add('color', TextType::class, [
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php
index 64a9ed3d..a4992f25 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PagewidgetType.php
@@ -170,6 +170,26 @@ class PagewidgetType extends AbstractType
                 ]) ;       
             } 
             
+            elseif($field->type=="appexternal") {
+                $id = $field->value;
+                $appexternals= $this->container->get('doctrine.orm.entity_manager')->getRepository("CadolesPortalBundle:Appexternal")->findAll();
+                $choices=array();
+                foreach($appexternals as $appexternal) {
+                    $choices[$appexternal->getName()]=$appexternal->getId();
+                }
+
+                $builder
+                ->add($field->id, ChoiceType::class, [
+                    'label' => $field->label,
+                    'mapped'=> false,
+                    'label_attr' => ['loc' => $field->loc],              
+                    'data' => $id,
+                    'required' => ($field->mandatory=="true"),
+                    'choices' => $choices,
+                    'placeholder'   => '-- Sélectionnez une application --',
+                ]) ;       
+            } 
+
             elseif($field->type=="target") {
                 $builder
                 ->add($field->id, ChoiceType::class, [
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
index 40469018..963d49ce 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
@@ -556,6 +556,14 @@ cadoles_portal_user_calendarevent_share:
 
 
 
+#== FEED =================================================================================================================================================
+
+cadoles_portal_user_feed_limesurvey:
+    path: /feed/limesurvey/{id}
+    defaults: { _controller: CadolesPortalBundle:Feed:limesurvey }   
+
+
+
 
 #== TOOL =================================================================================================================================================
 
@@ -661,6 +669,9 @@ cadoles_portal_config_panelwidget_view_calculator:
     path: config/pagewidget/view/calculator/{id}
     defaults: { _controller: CadolesPortalBundle:Pagewidget:viewcalculator, access: config }      
 
+cadoles_portal_config_panelwidget_view_appexternal:
+    path: config/pagewidget/view/appexternal/{id}
+    defaults: { _controller: CadolesPortalBundle:Pagewidget:viewappexternal, access: config }   
 
 #-- Access user    
 cadoles_portal_user_pagewidget_widget_sumbit:
@@ -746,3 +757,7 @@ cadoles_portal_user_panelwidget_view_clock:
 cadoles_portal_user_panelwidget_view_calculator:
     path: /pagewidget/view/calculator/{id}
     defaults: { _controller: CadolesPortalBundle:Pagewidget:viewcalculator, access: user }      
+
+cadoles_portal_user_panelwidget_view_appexternal:
+    path: /pagewidget/view/appexternal/{id}
+    defaults: { _controller: CadolesPortalBundle:Pagewidget:viewappexternal, access: user }   
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Feed/index.xml.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Feed/index.xml.twig
new file mode 100755
index 00000000..7f2acd37
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Feed/index.xml.twig
@@ -0,0 +1,37 @@
+{% autoescape %}
+{% set sessionconfigs = app.session.get('configs') %}
+<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0">
+<channel>
+<title>{{ app.session.get('appname') }}</title>
+<link>{{ absolute_url(path("cadoles_core_home")) }}</link>
+<description>{{ app.session.get('subappname') }}</description>
+{% for feed in feeds %}
+<item>
+    {% if feed.url is defined %}
+    <guid><![CDATA[{{feed.url}}]]></guid>
+    {% endif %}
+    {% if feed.title is defined %}
+    <title>{{feed.title}}</title>
+    {% endif %}
+    {% if feed.author is defined %}
+    <author>{{feed.author}}</author>
+    {% endif %}
+    {% if feed.category is defined %}
+    <categories>{{ feed.category }}</categories>
+    {% endif %}
+    {% if feed.date is defined %}
+    <pubDate>{{feed.date|date('D, d M Y H:i:s O')}}</pubDate>
+    {% endif %}
+    {% if feed.url is defined %}
+    <link><![CDATA[{{feed.url}}]]></link>
+    {% endif %}
+
+    {% if feed.description is defined %}
+    <description><![CDATA[{% autoescape 'html' %}{{feed.description|raw }}{% endautoescape %}]]></description>
+    {% endif %}
+</item>
+{% endfor %}
+</channel>
+</rss>
+{% endautoescape %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
index 508fac66..6f1da159 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
@@ -196,7 +196,9 @@
         
         // Création des grilles d'items
         var optiongrid={columnWidth: '.grid-sizer', itemSelector: '.grid-item', gutter: '.grid-gutter-sizer'};
-        var grid = $('.grid').masonry(optiongrid);        
+        $('body').imagesLoaded(function() {
+            var grid = $('.grid').masonry(optiongrid);        
+        });
 
         // Preview item de bureau
         $( ".grid .item-preview" ).click(function() {
@@ -409,10 +411,15 @@
 
     // Affichage d'un Flux 
     function showFlux(idwidget, id) {
-        console.log(idwidget);
-        
-        $(".widget[data-id="+idwidget+"]").find(".feed").hide();
-        $(".widget[data-id="+idwidget+"]").find(".flux-"+id).show();
+        if(id=="all")
+            $(".widget[data-id="+idwidget+"]").find(".feed").show();
+        else {
+            $(".widget[data-id="+idwidget+"]").find(".feed").hide();
+            $(".widget[data-id="+idwidget+"]").find(".flux-"+id).show();
+        }
+
+        var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'};
+        var grid = $('.grid').masonry(optiongrid);         
     }
       
 {% endblock %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
new file mode 100644
index 00000000..d0556461
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig
@@ -0,0 +1,95 @@
+{% set theme = app.session.get('theme') %}
+{% if theme is not empty %}
+    {{ include('@Theme/'~theme~'/function.html.twig') }}
+{% endif %}
+
+{% import "@CadolesPortal/Pagewidget/constants.twig" as constants %}
+
+{% set colormain = constants.mycolormain() %}
+{% set stylewidget = constants.mystylewidget(entity) %}
+{% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %}
+{% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
+{% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
+
+{% if modedesktop==0 %}
+    {% set stylegrid="" %}
+{% elseif modedesktop==1 %}
+    {% set stylegrid="grid-medium" %}
+{% elseif modedesktop==2 %}
+    {% set stylegrid="grid-small" %}
+{% endif %}
+
+{% set colorbodyfont = "" %}
+{% if entity.colorbodyfont is not null %}
+    {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %}
+{% endif %}
+
+<div class="widget {%if entity.border %} widget-bordered {%endif%}" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+    {% if canupdate or canadd %}
+    <div class="widgetmenu">
+        {% if canupdate %}
+            <i class="fa fa-trash fa-fw" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
+            <i class="fa fa-file fa-fw" onClick="modWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>
+        {% endif %}
+
+        {% if canadd %}
+            <i class="fa fa-plus fa-fw" onClick="addBookmark({{ entity.id }},true)" style="{{ stylewidgetmenu }}"></i>
+        {% endif %}
+    </div>
+    {% endif %}
+
+
+    <div class="widgetheader" style="{{ stylewidgetheader }}">
+        {% if entity.icon %}
+            <img src="/{{ alias }}/{{ entity.icon.label }}" class="logo"/>
+        {% else %}
+            <img src="/{{ alias }}/uploads/icon/icon_pin.png" class="logo"/>
+        {% endif %}
+        <span class="title">{{ entity.name }}</span>
+    </div>
+
+    <div class="widgetbody" style="{{ stylewidgetbody }}">
+        {% for itemcategory in itemcategorys %}
+            {% set haveitem=false %}
+
+            {% for item in items if item.itemcategory==itemcategory %}
+
+                {% if loop.index ==1 %}
+                {% set haveitem=true %}
+
+                <h3 class="grid-title" style="{{ colorbodyfont }}" data-idcategory="{{ itemcategory.id }}">{{ itemcategory.label }}</h3>
+
+
+                <div class="grid clearfix">
+                    <div class="grid-sizer {{ stylegrid }}"></div>
+                    <div class="grid-gutter-sizer"></div>
+                {% endif %}
+                                
+                    <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">
+
+
+                            <div class="item-link clearfix">
+                                <div class="grid-item-logo">
+                                    <img class="grid-item-img" height="110" src="/{{ alias }}/uploads/icon/{{ item.icon }}">
+                                </div>
+
+                                <div class="grid-item-title">
+                                    <h2>{{ item.title }}</h2>
+                                     <span>{{ item.subtitle|nl2br }}</<span>
+                                </div>                    
+                            </div>
+                            </a>
+                        </div>
+                    </div>
+            {% endfor %}
+            {% if haveitem %}            
+                </div>
+            {% endif %}
+        {% endfor %}
+    </div>
+</div>
+
+
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
index 35c64136..08ca852f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
@@ -11,6 +11,25 @@
 {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
 {% set color = app.session.get('color') %}
 
+{% set colorbodyfont = entity.colorbodyfont %}
+{% if colorbodyfont is null %}
+    {% set colorbodyfont = color['fontcolorhover'] %}
+{% endif %}
+
+{% set colorbodyback = entity.colorbodyback %}
+{% if colorbodyback is null %}
+    {% set colorbodyback = color['main'] %}
+{% endif %}
+
+{% set colorbodyfont = entity.colorbodyfont %}
+{% if colorbodyfont is null %}
+    {% if colorbodyback==color['fontcolorhover'] %}
+        {% set colorbodyfont = color['main'] %}
+    {% else %}
+        {% set colorbodyfont = color['fontcolorhover'] %}
+    {% endif %}
+{% endif %}
+
 <style>
 
 
@@ -39,38 +58,50 @@
 
     <div class="widgetbody" style="{{ stylewidgetbody }}">
         {% if fluxs is defined %}
-            {% for flux in fluxs %}
-                {% if loop.first %}
-                    {% set firstflux = flux.id %}
-                {% endif %}
+            {% if fluxs|length > 1 %}
+                <div class="cat-list-feed" onClick="showFlux({{ entity.id}},'all')" style="background-color: #{{ color['main'] }}">Tout</div>
 
-                {% set stylefeed = "background-color: #" ~ color['main']  ~ ";" %}
-                {% if flux.color is not null %}
-                    {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %}
-                {% endif %}
+                {% for flux in fluxs %}
+                    {% set stylefeed = "background-color: #" ~ color['main']  ~ ";" %}
+                    {% if flux.color is not null %}
+                        {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %}
+                    {% endif %}
 
-                {% if fluxs|length > 1 %}
                     <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }}">{{ flux.title }}</div>
-                {% endif %}
-            {% endfor %}
+                {% endfor %}
+            {% endif %}
         {% endif %}
 
-        {% for feed in feeds %}
-            {% set stylefeed = "background-color: #" ~ color['main']  ~ ";" %}
-            {% if feed.color is defined and feed.color is not null %}
-                {% set stylefeed = "background-color: #" ~ feed.color ~ ";" %}
-            {% endif %}
-            {% if feed.image is not null and feed.image != ""%}
-                {% set stylefeed = stylefeed ~ "background: url(" ~ feed.image ~ ") no-repeat center; background-size: cover;" %}
-            {% endif %}
+        <div class="grid clearfix">
+            {% for feed in feeds %}
+                {% if loop.index==1 %}
+                    <div class="grid-sizer grid-preview"></div>
+                    <div class="grid-gutter-sizer grid-gutter-sizer-preview"></div>
+                {% endif %}
 
-            <a href="{{ feed.link }}" target="_blank">
-                <div class="panel list-item feed flux-{{ feed.fluxid }}" style="{{ stylefeed }}; {% if feed.fluxid!=firstflux %} display:none; {% endif %}">
-                    <h1>{{ feed.title }}</h1>
-                    <div class="description">{{ feed.description | nl2br }}</div>
+                
+                {% set stylefeed = "background-color: #" ~ color['main']  ~ ";" %}
+                {% if feed.color is defined and feed.color is not null %}
+                    {% set stylefeed = "background-color: #" ~ feed.color ~ ";" %}
+                {% endif %}
+                {% if feed.image is not null and feed.image != ""%}
+                    {% set stylefeed = stylefeed ~ "background: url(" ~ feed.image ~ ") no-repeat center; background-size: cover;" %}
+                {% endif %}
+
+                <div class="grid-item grid-preview feed flux-{{ feed.fluxid }}">
+                    <a href="{{ feed.link }}" target="_blank">
+                        {% if feed.image is not empty %}
+                            <img src="{{feed.image}}" width="100%">
+                        {% endif %}
+                        <div class="caption" style="background-color: #{{ colorbodyfont }}; color: #{{ colorbodyback }};">
+                            <h1 class="grid-preview-title" style="color: #{{ colorbodyback }};">{{ feed.title }}</h1>
+                            <small>le {{ feed.date|date("d/m/Y à H:i") }}</small><br>
+                            {{ feed.description | nl2br }}
+                        </div>
+                    </a>
                 </div>
-            </a>
-        {% endfor %}
+            {% endfor %}
+        </div>
     </div>
 </div>
 
diff --git a/src/ninegate-1.0/src/Cadoles/SAMLBundle/Controller/DefaultController.php b/src/ninegate-1.0/src/Cadoles/SAMLBundle/Controller/DefaultController.php
index 4a0ed8e2..4aa05668 100644
--- a/src/ninegate-1.0/src/Cadoles/SAMLBundle/Controller/DefaultController.php
+++ b/src/ninegate-1.0/src/Cadoles/SAMLBundle/Controller/DefaultController.php
@@ -16,6 +16,10 @@ class DefaultController extends BaseController
 
     public function discoveryAction()
     {
+        $masteridentity=$this->getParameter("masteridentity");
+        if($masteridentity!="SAML")
+            return;
+            
         $request = $this->container->get('request_stack')->getCurrentRequest();
 
         $parties = $this->get('lightsaml.container.build')->getPartyContainer()->getIdpEntityDescriptorStore()->all();
diff --git a/src/ninegate-1.0/web/uploads/icon/icon_limesurvey.png b/src/ninegate-1.0/web/uploads/icon/icon_limesurvey.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8caa385ab5a149f36457d9edafbdf368352e5c
GIT binary patch
literal 19159
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

literal 0
HcmV?d00001