Adaptation au plugin

app/Resources/translations/elements.en.yml

@@ -19,6 +19,7 @@ element:
     group:
       will_be_in:       This element will be add to the group.
     url_title_step2:    Ressource
+    shared_from_finish: Music shared, you can close the box (top-left cross)
   show:
     close_embed:        Close the player
     open_embed:         Display the player

app/Resources/translations/elements.fr.yml

@@ -18,6 +18,7 @@ element:
     group:
       will_be_in:       L'élément sera ajouté dans le groupe
     url_title_step2:    Ressource
+    shared_from_finish: Le partage a été effectué, vous pouvez fermer la boite (croix en haut à gauche)
   show:
     close_embed:        Fermer le lecteur
     open_embed:         Afficher le lecteur

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -284,7 +284,8 @@ class CoreController extends Controller
         return $this->jsonResponse(array(
           'status' => 'success',
           'html'   => $html,
-          'groups' => (!$group)?$this->isAddedElementCanBeInGroup($element):array()
+          'groups' => (!$group)?$this->isAddedElementCanBeInGroup($element):array(),
+          'message' => ($this->getRequest()->get('shared_from'))?$this->trans('element.add.shared_from_finish', array(), 'elements'):''
         ));
       }
       else
@@ -691,4 +692,13 @@ class CoreController extends Controller
     throw new \Exception('test error');
   }
   
+  public function getCsrfTokenAction()
+  {
+    if (($response = $this->mustBeConnected(true)))
+      return $response;
+    
+    $csrfToken = $this->container->get('form.csrf_provider')->generateCsrfToken('unknown');
+    return $this->jsonSuccessResponse($csrfToken);
+  }
+  
 }

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -212,4 +212,9 @@ url_get_embed_for_element:
 
 share_from:
   pattern: /element/share/from
-  defaults: { _controller: MuzichCoreBundle:Element:shareFrom }
+  defaults: { _controller: MuzichCoreBundle:Element:shareFrom }
+  
+get_csrf_token:
+  pattern: /ajax/getcsrf
+  defaults: { _controller: MuzichCoreBundle:Core:getCsrfToken }
+  

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -2509,6 +2509,13 @@ div#tags_prompt_search p.help_notags span
   width: 100%;
 }
 
+div#share_from_message
+{
+  font-weight: bold;
+  padding: 15px;
+  font-size: 115%;
+}
+
 /*
 *
 *

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -23,7 +23,7 @@ function hideAllMessages()
 
 function ResponseController()
 {
-  var propagate = function(response)
+  var propagate = function(response, after_login_success_callback)
   {
     if (response.status === 'error')
     {
@@ -35,18 +35,19 @@ function ResponseController()
       }
       else if (response.error === 'UserNotConnected')
       {
-        open_connection_or_subscription_window();
+        open_connection_or_subscription_window(false, {}, after_login_success_callback);
       }
     }
     else if (response.status === 'mustbeconnected')
     {
-      open_connection_or_subscription_window(true);
+      open_connection_or_subscription_window(true, {}, after_login_success_callback);
     }
-  }
+  };
   
-  this.execute = function(response, success_callback, failure_callback)
+  this.execute = function(response, success_callback, failure_callback, after_login_success_callback)
   {
-    propagate(response);
+    propagate(response, after_login_success_callback);
+    
     if (response.status === 'success')
     {
       success_callback(response);
@@ -55,7 +56,7 @@ function ResponseController()
     {
       failure_callback(response);
     }
-  }
+  };
 }
 
 window.ResponseController = new ResponseController();
@@ -1320,6 +1321,16 @@ $(document).ready(function(){
       
       form_add_hide_errors();
       
+      // Dans le cas d'un ajout depuis l'extérieur (iframe)
+      if ($('form[name="add"] input[name="shared_from"]').val() === "1")
+      {
+        var elements = $('<ul class="elements"></ul>')
+        elements.prepend(response.html);
+        $('div#share_from_content').append(elements);
+        $('div#share_from_message').text(response.message);
+        //$('form[name="add"]').append($('<input type="hidden" name="shared_from_finished" id="shared_from_finished" value="1" />'));
+      }
+      
       return true;
     }
     else if (response.status == 'error')
@@ -1540,11 +1551,30 @@ $(document).ready(function(){
   });
   $('form[name="add"]').ajaxForm(function(response) {
     
+    var callback_login = null;
+    // Dans le cas d'un ajout depuis l'extérieur (iframe)
+    if ($('form[name="add"] input[name="shared_from"]').val() === "1")
+    {
+      callback_login = function(){ 
+        $('#form_add_loader').show();
+        JQueryJson(url_csrf, {}, function(response){
+          if (response.status == 'success')
+          {
+            $('form[name="add"] input[name="element_add[_token]"]').val(response.data);
+            $('form[name="add"]').submit();
+            $('#form_add_loader').hide();
+          }
+        });
+         
+      };
+    }
+    
     $('form[name="add"] img.tag_loader').hide();
     window.ResponseController.execute(
       response,
       function(){},
-      function(){}
+      function(){},
+      callback_login
     );
     
       // Si on en est a la première étape la réponse sera des données récupérés auprès
@@ -3361,7 +3391,7 @@ function open_ajax_popin(url, callback, data)
   }
 }
 
-function open_connection_or_subscription_window(open_login_part, data)
+function open_connection_or_subscription_window(open_login_part, data, login_success_callback)
 {
   if (window_login_or_subscription_opened == false)
   {
@@ -3390,7 +3420,15 @@ function open_connection_or_subscription_window(open_login_part, data)
         $('div.login form').find('img.loader').hide();
         if (response.status == 'success')
         {
-          $(location).attr('href', response.data.redirect_url);
+          if (login_success_callback)
+          {
+            $('a#helpbox_close').click();
+            login_success_callback();
+          }
+          else
+          {
+            $(location).attr('href', response.data.redirect_url);
+          }
         }
         else if (response.status == 'error')
         {
@@ -3407,7 +3445,15 @@ function open_connection_or_subscription_window(open_login_part, data)
         $('div.register form.fos_user_registration_register').find('img.loader').hide();
         if (response.status == 'success')
         {
-          $(location).attr('href', url_home);
+          if (login_success_callback)
+          {
+            $('a#helpbox_close').click();
+            login_success_callback();
+          }
+          else
+          {
+            $(location).attr('href', url_home);
+          }
         }
         else if (response.status == 'error')
         {

src/Muzich/CoreBundle/Resources/views/Component/element_add_box.html.twig

@@ -7,6 +7,9 @@
 {% if show_add_to_group is not defined %}
   {% set show_add_to_group = true %}
 {% endif %}
+{% if shared_from is not defined %}
+  {% set shared_from = 0 %}
+{% endif %}
 
 {% if not group_slug %}
   {% set form_action = path('element_add') %}
@@ -37,6 +40,8 @@
       'form_name'     : add_form_name
     } %}
   
+     <input type="hidden" name="shared_from" value="{{ shared_from }}" />
+          
   </form>
 </div>
 

src/Muzich/CoreBundle/Resources/views/Element/share_from.html.twig

@@ -7,6 +7,7 @@
   {% include 'MuzichCoreBundle:Component:element_add_box.html.twig' with {
     'box_title'     : 'home.add_element_box.title_external'|trans({}, 'navigationui'),
     'add_form_name' : 'add',
+    'shared_from'   : 1
   } %}
 
   <script type="text/javascript">
@@ -19,5 +20,8 @@
       $('form[name="add"]').submit();
     });
   </script>
+  
+  <div id="share_from_content"></div>
+  <div id="share_from_message"></div>
 
 {% endblock %}

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -129,7 +129,7 @@
   url_img_ajax_loader = "{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}";
   url_get_embed_for_element = "{{ path('url_get_embed_for_element') }}";
   url_helpbox_tags_favorites = "{{ path('helpbox_tags_favorites') }}";
-  
+  url_csrf = "{{ path('get_csrf_token') }}";
   url_subscription_or_login = "{{ path('subscribe_or_login') }}";
   url_email_not_confirmed = "{{ path('email_not_confirmed') }}";
   url_send_email_confirmation = "{{ path('send_email_confirmation') }}";

src/Muzich/CoreBundle/lib/Controller.php

@@ -499,14 +499,13 @@ class Controller extends BaseController
     
     if ($this->getUser() == 'anon.')
     {
-      $this->setFlash('error', 'user.session_expired');
-      
       if ($this->getRequest()->isXmlHttpRequest())
       {
         return $this->mustBeConnectedResponse();
       }
       else
       {
+        $this->setFlash('error', 'user.session_expired');
         return $this->redirect($this->generateUrl('home'));
       }
     }