10 changed files with 13 additions and 127 deletions
--- a/src/ninegate-1.0/app/config/config.yml
+++ b/src/ninegate-1.0/app/config/config.yml
@ -147,7 +147,7 @@ ivory_ck_editor:
            language: fr
            toolbar: "my_toolbar_1"
            uiColor: "#ffffff"
-            extraPlugins: ["html5video"]
+            extraPlugins: ["html5video","pastebase64"]
        light_config:
            language: fr
            toolbar: "my_toolbar_2"
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/PurgeFileCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/PurgeFileCommand.php
@ -380,46 +380,6 @@ class PurgeFileCommand extends Command
                    if($result) $find=true;
                }

-                // Si pas trouvé on la cherche dans les projecttask
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Projecttask")->createQueryBuilder('projecttask')
-                            ->where('projecttask.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les projectcomment
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Projectcomment")->createQueryBuilder('projectcomment')
-                            ->where('projectcomment.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les blogcomment
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Blogcomment")->createQueryBuilder('blogcomment')
-                            ->where('blogcomment.description LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
-                // Si pas trouvé on la cherche dans les alert
-                if(!$find) {
-                    $result = $this->em
-                            ->getRepository("CadolesPortalBundle:Alert")->createQueryBuilder('alert')
-                            ->where('alert.content LIKE :tofind')
-                            ->setParameter('tofind', '%'.$tofind.'%')
-                            ->getQuery()->getResult();                
-                    if($result) $find=true;
-                }
-
                // Si pas trouvé on supprime
                if(!$find) {
                    $this->writeln($name);
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailType.php
@ -52,7 +52,7 @@ class MailType extends AbstractType
            'mapped'=> false,
            'required' => false,
            'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "150px"]
+            'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
        ]);
    }

--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailingType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/MailingType.php
@ -99,7 +99,7 @@ class MailingType extends AbstractType
                'mapped'=> false,
                'required' => true,
                'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-                'config' => ["height" => "400px"]
+                'config' => ["height" => "400px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
            ]);

    }
--- a/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
+++ b/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
@ -674,10 +674,10 @@ $api('$id',data);";
    }

    public function sessionAction($id="",$access="config") {
-        // mode_auth
-        $mode_auth=$this->getParameter("mode_auth");
-        if($mode_auth!="CAS") {
-            $output["error"]="Le bundle Edispatcher ne fonctionne qu'en mode mode_auth=CAS";
+        // Masteridentity
+        $masteridentity=$this->getParameter("masteridentity");
+        if($masteridentity!="SSO") {
+            $output["error"]="Le bundle Edispatcher ne fonctionne qu'en mode MasterIdentity=SSO";
            return new Response(json_encode($output), 400);
        }

--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/AlertController.php
@ -8,7 +8,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Form\FormError;
-use Symfony\Component\Filesystem\Filesystem;

 use Cadoles\PortalBundle\Entity\Alert;
 use Cadoles\PortalBundle\Form\AlertType;
@ -196,32 +195,6 @@ class AlertController extends Controller
        return $response;        
    }

-    public function uploadAction(Request $request,$access=null) {
-        // Fichier temporaire uploadé
-        $tmpfile    = $request->files->get('upload');
-        $extention  = $tmpfile->getClientOriginalExtension();
-
-        // Répertoire de Destination
-        $fs         = new Filesystem();
-        $rootdir    = $this->get('kernel')->getRootDir()."/../web";
-        $fs->mkdir($rootdir."/uploads/ckeditor");
-        
-        // Fichier cible
-        $targetName = uniqid().".".$extention;
-        $targetFile = $rootdir."/uploads/ckeditor/".$targetName;
-        $targetUrl  = "/".$this->getParameter('alias')."/uploads/ckeditor/".$targetName;
-        $message    = "";
-
-        move_uploaded_file($tmpfile,$targetFile);
-        
-        $output["uploaded"]=1;
-        $output["fileName"]=$targetName;
-        $output["url"]=$targetUrl;
-
-        return new Response(json_encode($output));
-
-    } 
-
    public function readAction(Request $request) {
        $output=array();
        $id=$request->request->get('id');
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php
@ -33,7 +33,7 @@ class AlertType extends AbstractType
                "label"         => 'Description',
                "required"      => false,
                "disabled"      => ($options["mode"]=="delete"?true:false),
-                "config"        => array("height" => "500px","filebrowserUploadRoute" => 'cadoles_portal_config_alert_upload')
+                "config"        => array("height" => "500px")
            ])

            ->add("fghideable",ChoiceType::class,[
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
@ -159,13 +159,6 @@ cadoles_portal_config_alert_order:
    path: /config/alert/order
    defaults: { _controller: CadolesPortalBundle:Alert:order } 

-cadoles_portal_config_alert_upload:
-    path: /config/alert/upload
-    defaults: { _controller: CadolesPortalBundle:Alert:upload } 
-cadoles_portal_config_alert_upload_direct:
-    path: /config/alert/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Alert:upload } 
-
 cadoles_portal_config_ajax_alert_seleclist:
    path: /config/alert/ajax/selectlist
    defaults: { _controller: CadolesPortalBundle:Alert:ajaxseleclist }
@ -328,9 +321,6 @@ cadoles_portal_config_page_order:
 cadoles_portal_config_page_upload:
    path: /config/page/upload
    defaults: { _controller: CadolesPortalBundle:Page:upload, access: config }  
-cadoles_portal_config_page_upload_direct:
-    path: /config/page/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Page:upload, access: config }  

 #-- Access user    
 cadoles_portal_user_page_submit:
@ -360,9 +350,6 @@ cadoles_portal_user_page_order:
 cadoles_portal_user_page_upload:
    path: /user/page/upload
    defaults: { _controller: CadolesPortalBundle:Page:upload, access: user }  
-cadoles_portal_user_page_upload_direct:
-    path: /user/page/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Page:upload, access: user }

 # Page spécifique
 cadoles_portal_user_page_application:
@ -544,10 +531,7 @@ cadoles_portal_config_blogarticle_delete:
 cadoles_portal_config_blogarticle_upload:
    path: /config/blogarticle/upload
    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: config }    
-cadoles_portal_config_blogarticle_upload_direct:
-    path: /config/blogarticle/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: config }
-    
+
 cadoles_portal_config_blogarticle_image:
    path: /config/blogarticle/image
    defaults: { _controller: CadolesPortalBundle:Blogarticle:image, access: config } 
@ -572,9 +556,6 @@ cadoles_portal_user_blogarticle_delete:
 cadoles_portal_user_blogarticle_upload:
    path: /user/blogarticle/upload
    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: user } 
-cadoles_portal_user_blogarticle_upload_direct:
-    path: /user/blogarticle/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogarticle:upload, access: user }

 cadoles_portal_user_blogarticle_image:
    path: /user/blogarticle/image
@ -603,9 +584,6 @@ cadoles_portal_config_blogcomment_delete:
 cadoles_portal_config_blogcomment_upload:
    path: /config/blogcomment/upload
    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: config }    
-cadoles_portal_config_blogcomment_upload_direct:
-    path: /config/blogcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: config }

 #-- Access user   
 cadoles_portal_user_blogcomment_submit:
@ -627,9 +605,7 @@ cadoles_portal_user_blogcomment_delete:
 cadoles_portal_user_blogcomment_upload:
    path: /user/blogcomment/upload
    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: user } 
-cadoles_portal_user_blogcomment_upload_direct:
-    path: /user/blogcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Blogcomment:upload, access: user }
+

 #== CALENDAR =============================================================================================================================================

@ -828,9 +804,6 @@ cadoles_portal_config_projecttask_delete:
 cadoles_portal_config_projecttask_upload:
    path: /config/projecttask/upload
    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: config }    
-cadoles_portal_config_projecttask_upload_direct:
-    path: /config/projecttask/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: config }

 cadoles_portal_config_projecttask_users:
    path: /config/projecttask/users
@ -860,9 +833,6 @@ cadoles_portal_user_projecttask_delete:
 cadoles_portal_user_projecttask_upload:
    path: /user/projecttask/upload
    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: user } 
-cadoles_portal_user_projecttask_upload_direct:
-    path: /user/projecttask/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projecttask:upload, access: user }

 cadoles_portal_user_projecttask_users:
    path: /user/projecttask/users
@ -891,9 +861,6 @@ cadoles_portal_config_projectcomment_delete:
 cadoles_portal_config_projectcomment_upload:
    path: /config/projectcomment/upload
    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: config }    
-cadoles_portal_config_projectcomment_upload_direct:
-    path: /config/projectcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: config }

 #-- Access user   
 cadoles_portal_user_projectcomment_submit:
@ -911,9 +878,7 @@ cadoles_portal_user_projectcomment_delete:
 cadoles_portal_user_projectcomment_upload:
    path: /user/projectcomment/upload
    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: user } 
-cadoles_portal_user_projectcomment_upload_direct:
-    path: /user/projectcomment/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Projectcomment:upload, access: user }
+

 #== FEED =================================================================================================================================================

@ -965,9 +930,6 @@ cadoles_portal_config_pagewidget_order:
 cadoles_portal_config_pagewidget_upload:
    path: /config/pagewidget/upload
    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: config }     
-cadoles_portal_config_pagewidget_upload_direct:
-    path: /config/pagewidget/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: config } 

 cadoles_portal_config_panelwidget_view_url:
    path: /config/pagewidget/view/url/{id}
@ -1089,9 +1051,6 @@ cadoles_portal_user_pagewidget_order:
 cadoles_portal_user_pagewidget_upload:
    path: /user/pagewidget/upload
    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: user }  
-cadoles_portal_user_pagewidget_upload_direct:
-    path: /user/pagewidget/upload&responseType=json
-    defaults: { _controller: CadolesPortalBundle:Pagewidget:upload, access: user } 

 cadoles_portal_user_panelwidget_view_url:
    path: /pagewidget/view/url/{id}
--- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php
+++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Form/ChatType.php
@ -30,7 +30,7 @@ class ChatType extends AbstractType
            'mapped'=> false,
            'required' => false,
            'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "100px"],
+            'config' => ["height" => "100px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload',],
        ]);
        
        $builder
@ -40,7 +40,7 @@ class ChatType extends AbstractType
            'mapped'=> false,
            'required' => false,
            'attr' => array("class" => "form-control", "style" => "margin-bottom:15px"),
-            'config' => ["height" => "150px"]
+            'config' => ["height" => "150px",'filebrowserUploadRoute' => 'cadoles_portal_user_pagewidget_upload']
        ]);
    }

--- a/tmpl/ninegate-template.yml
+++ b/tmpl/ninegate-template.yml
@ -133,11 +133,6 @@ parameters:
 %else
    ldap_tls: false
 %end if
-
-%if %%getVar("ninegate_masteridentity", 'SQL') != "SQL"
-    ldap_user: %%ldap_reader
-    ldap_password: %%pwdreader("",%%ldap_reader_passfile)
-%else
 %if %%getVar("activer_admin_passfile", 'non') == "oui"
    %if %%getVar("ldap_writer", '') == ""
    ldap_user: cn=admin,o=gouv,c=fr
@ -148,7 +143,6 @@ parameters:
 %else
    ldap_user: %%ldap_reader
    ldap_password: %%pwdreader("",%%ldap_reader_passfile)
-%end if
 %end if
    ldap_basedn: %%ldap_base_dn
 %if %%getVar("ninegate_ldaptype", 'LDAP') == "AD"