Evolution #414: Navigation en mode non inscrit

src/Muzich/CommentBundle/Resources/views/Comment/comment.html.twig

@@ -5,31 +5,41 @@
    {{ date_or_relative_date(comment.e, 'comment.edited') }}{% endif %})
 </span>
 
-{% if app.user.id != comment.u.i %}
+{% if app.user %}
+  {% if app.user.id != comment.u.i %}
+    <a title="{{ 'comment.report.link_title'|trans({}, 'userui') }}" 
+      class="comment_report" 
+      href="{{ path('ajax_alert_comment', {'element_id':element_id, 'date': comment.d, 'token':app.user.getPersonalHash(element_id)}) }}">
+      <img src="{{ asset('bundles/muzichcore/img/1331832708_comment_alert.png') }}" alt="report" />
+    </a>
+  {% endif %}
+{% else %}
   <a title="{{ 'comment.report.link_title'|trans({}, 'userui') }}" 
-    class="comment_report" 
-    href="{{ path('ajax_alert_comment', {'element_id':element_id, 'date': comment.d, 'token':app.user.getPersonalHash(element_id)}) }}">
+    class="mustbeconnected" 
+    href="#">
     <img src="{{ asset('bundles/muzichcore/img/1331832708_comment_alert.png') }}" alt="report" />
   </a>
 {% endif %}
 
-{% if app.user.id == comment.u.i %}
-  <a title="{{ 'comment.edit.link'|trans({}, 'elements') }}" class="comment_edit_link" 
-     href="{{ path('ajax_edit_comment', {'element_id': element_id, 'date':comment.d, 'token':app.user.getPersonalHash(element_id)})  }}" style="display: none;"
-  >
-    <img src="{{ asset('bundles/muzichcore/img/1327151338_desktop.png') }}" alt="edit" />
-  </a>
-
-  <a title="{{ 'comment.remove.link'|trans({}, 'elements') }}" class="comment_remove_link" 
-     href="{{ path('ajax_delete_comment', {'element_id': element_id, 'date':comment.d, 'token':app.user.getPersonalHash(element_id)})  }}" style="display: none;"
-  >
-    <img src="{{ asset('bundles/muzichcore/img/1327168960_fileclose.png') }}" alt="delete" />
-  </a>
-
-  <img 
-    class="comment_loader" 
-    style="display: none;" 
-    src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" 
-    alt="loading"
-  />
+{% if app.user %}
+  {% if app.user.id == comment.u.i %}
+    <a title="{{ 'comment.edit.link'|trans({}, 'elements') }}" class="comment_edit_link" 
+       href="{{ path('ajax_edit_comment', {'element_id': element_id, 'date':comment.d, 'token':app.user.getPersonalHash(element_id)})  }}" style="display: none;"
+    >
+      <img src="{{ asset('bundles/muzichcore/img/1327151338_desktop.png') }}" alt="edit" />
+    </a>
+  
+    <a title="{{ 'comment.remove.link'|trans({}, 'elements') }}" class="comment_remove_link" 
+       href="{{ path('ajax_delete_comment', {'element_id': element_id, 'date':comment.d, 'token':app.user.getPersonalHash(element_id)})  }}" style="display: none;"
+    >
+      <img src="{{ asset('bundles/muzichcore/img/1327168960_fileclose.png') }}" alt="delete" />
+    </a>
+  
+    <img 
+      class="comment_loader" 
+      style="display: none;" 
+      src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" 
+      alt="loading"
+    />
+  {% endif %}
 {% endif %}

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -438,12 +438,7 @@ class CoreController extends Controller
    * @return Response 
    */
   public function getFavoriteTagsAction()
-  {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
+  {    
     // On construit l'element searcher avec les tags favoris
     $es = $this->getElementSearcher(null, true);
     // Et on retourne les tags

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -329,11 +329,6 @@ class ElementController extends Controller
       return $this->redirect($this->generateUrl('index'));
     }
     
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     if ($this->getRequest()->getMethod() != 'POST')
     {
       throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
@@ -358,7 +353,7 @@ class ElementController extends Controller
       'id_limit'  => $refid
     ));
     
-    $count = $es->getElements($this->getDoctrine(), $this->getUserId(), 'count');
+    $count = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'count');
     
     return $this->jsonResponse(array(
       'status'   => 'success',
@@ -1028,11 +1023,6 @@ class ElementController extends Controller
    */
   public function getDatasAutoplayAction(Request $request, $element_id, $type, $data, $show_type = null, $show_id = null)
   {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
     $elements = array();
     $elements_json = array();
     
@@ -1044,7 +1034,7 @@ class ElementController extends Controller
         'count' => $this->container->getParameter('autoplay_max_elements'),
         'id_limit' => $element_id+1
       ));
-      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     }
     elseif ($type == 'show')
     {
@@ -1098,7 +1088,7 @@ class ElementController extends Controller
         'id_limit' => $element_id+1
       ));
       
-      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     }
     
     if (count($elements))
@@ -1116,11 +1106,6 @@ class ElementController extends Controller
   
   public function getOneDomAction(Request $request, $element_id, $type)
   {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     if (!in_array($type, array('autoplay')))
     {
       return $this->jsonResponse(array(
@@ -1147,7 +1132,7 @@ class ElementController extends Controller
       'ids' => array($element_id)
     ));
     
-    if (!($element = $es->getElements($this->getDoctrine(), $this->getUserId(), 'single')))
+    if (!($element = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'single')))
     {
       throw $this->createNotFoundException('Not found');
     }
@@ -1165,15 +1150,8 @@ class ElementController extends Controller
     ));
   }
   
-  
-  
   public function geJamendotStreamDatasAction(Request $request, $element_id)
   {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
       ->findOneById($element_id)))
     {

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -64,11 +64,6 @@ class SearchController extends Controller
    */
   public function searchElementsAction($context, $id_limit = null, $session_id = null)
   {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     $request = $this->getRequest();
     $search_object = $this->getElementSearcher(null, false, $session_id);
     
@@ -126,7 +121,7 @@ class SearchController extends Controller
         'id_limit' => $id_limit
       ));
       
-      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
       
       return $this->searchElementsMore($context, null, $elements, $message, $session_id);      
     }
@@ -246,11 +241,6 @@ class SearchController extends Controller
    */
   public function searchTagAction($timestamp)
   {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     $string_search = $this->getRequest()->request->get('string_search');
     
     if ($this->getRequest()->isXmlHttpRequest())
@@ -260,7 +250,7 @@ class SearchController extends Controller
         // On utilise l'objet TagLike
         $TagLike = new TagLike($this->getDoctrine()->getEntityManager());
         // Pour trier nos tags d'une manière plus humaine
-        $sort_response = $TagLike->getSimilarTags($string_search, $this->getUserId());
+        $sort_response = $TagLike->getSimilarTags($string_search, $this->getUserId(true));
       
         $status = 'success';
         $error  = '';

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

@@ -17,7 +17,7 @@ security:
             pattern:      .*
             form_login:
                 provider:       fos_userbundle
-                login_path:     index
+                login_path:     home
                 use_forward:    false
                 check_path:     /login_check
                 failure_path:   null
@@ -25,7 +25,7 @@ security:
                 
             logout:
                 path:   /logout
-                target: /hello
+                target: /home
             anonymous:  ~
             remember_me:
               key:      %secret%
@@ -89,6 +89,11 @@ security:
         - { path: ^/(?:fr|en)/event/view/elements, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/test-error, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/share-from, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        
+        ## New public roads for visitors
+        - { path: ^/(?:fr|en)$, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(?:fr|en)/$, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/$, role: IS_AUTHENTICATED_ANONYMOUSLY }
                                         
         - { path: ^/, roles: ROLE_USER }
         

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

@@ -544,7 +544,7 @@ img.tag_add_to_favorites
   margin-left: 1px;
 }
 
-td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.hide_comments, div.comments a.add_comment
+td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.add_comment_disabled, td.element_content a.hide_comments, div.comments a.add_comment
 {
   color: #404040;
 }
@@ -2045,4 +2045,9 @@ div.helpbox_image_container img
 
 .fotter_muzich_little{
   font-size: 9px;
+}
+
+div.side_margin_top
+{
+  margin-top: 25px;
 }

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

@@ -35,7 +35,14 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
   {
     if (!tag_id)
     {
-      openTagSubmission(tag_name);
+      if (!visitor)
+      {
+        openTagSubmission(tag_name);
+      }
+      else
+      {
+        open_connection_or_subscription_window();
+      }
     }
     else
     {

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

@@ -6,7 +6,8 @@
  */
 
 // Messages flashs
-var myMessages = ['info','warning','error','success']; // define the messages types	
+var myMessages = ['info','warning','error','success']; // define the messages types
+var window_login_or_subscription_opened = false;
 
 function hideAllMessages()
 {
@@ -1697,7 +1698,7 @@ $(document).ready(function(){
           
             if (response.status == 'mustbeconnected')
             {
-              $(location).attr('href', url_index);
+              alert('pouet!');
             }
 
             if (response.status == 'success' && response.count)
@@ -2077,7 +2078,7 @@ $(document).ready(function(){
         }
       }
     );
-      
+  
   $('a.tag_to_favorites').jConfirmAction({
     question : string_tag_addtofav_confirm_sentence, 
     yesAnswer : string_tag_addtofav_confirm_yes, 
@@ -2628,6 +2629,12 @@ $(document).ready(function(){
    
    // Ouverture de la zone "ajouter un element""
    $('#element_add_link').click(function(){
+    
+    if ($(this).hasClass('mustbeconnected'))
+    {
+      return false;
+    }
+    
      $('#element_add_box').slideDown("slow");
      $('#element_add_link').hide();
      $('#element_add_close_link').show();
@@ -2903,4 +2910,22 @@ $(document).ready(function(){
       $('div#add_tag').fadeOut();
     });
    
+  /*
+    * MUSTBECONNECTED links
+    */
+   
+    $('a.mustbeconnected').live('click', function(){open_connection_or_subscription_window();});
+    $('a.mustbeconnected').off('click').on('click',function(){
+      open_connection_or_subscription_window();
+    });
+   
 });
+
+function open_connection_or_subscription_window()
+{
+  if (window_login_or_subscription_opened == false)
+  {
+    window_login_or_subscription_opened = true;
+    alert('must be connected');
+  }
+}

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

@@ -5,7 +5,7 @@
   {% set close_class = ''%}
 {% endif %}
 
-<a href="#" id="element_add_link" class="button gradient {{ add_class }}">
+<a href="#" id="element_add_link" class="button gradient {{ add_class }} {% if not app.user %}mustbeconnected{% endif %}">
   {{ 'home.add_element'|trans({}, 'navigationui') }}
   <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
 </a>

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

@@ -69,6 +69,11 @@
 {% endif %}
 
 <script type="text/javascript">
+  {% if app.user %}
+    visitor = false;
+  {% else %}
+    visitor = true;
+  {% endif %}
   string_follow_stop = "{{ 'user.stop_follow'|trans({}, 'users') }}";
   string_follow_following = "{{ 'user.following'|trans({}, 'users') }}";
   string_follow_follow = "{{ 'user.follow'|trans({}, 'users') }}";

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

@@ -8,8 +8,6 @@
   
   {% include 'MuzichCoreBundle:Menu:access.html.twig' %}
   
-  {% if app.user %}
-    {% include 'MuzichCoreBundle:Menu:main_menu.html.twig' %}
-  {% endif %}
+  {% include 'MuzichCoreBundle:Menu:main_menu.html.twig' %}
   
 </div>

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

@@ -4,13 +4,16 @@
       {% render "MuzichUserBundle:Event:infoBar" %}
     {% endif %}
   </div>
+{% else %}
+  <div class="side_margin_top"></div>
+{% endif %}
 
   <div id="searchbox" class="nicebox">
     {% render "MuzichCoreBundle:Search:renderGlobalSearchForm" %}
   </div>
   
   {% include 'MuzichCoreBundle:Layout:social.html.twig' %}
-  
-  {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
 
+{% if app.user %}
+  {% render 'MuzichCoreBundle:Core:renderSideMenu' %}
 {% endif %}

src/Muzich/CoreBundle/Resources/views/Menu/main_menu.html.twig

@@ -4,34 +4,74 @@
     {% set network_public = '' %}
   {% endif %}
   
-  <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
-    <a id="link_all_network" href="{{ path('home') }}" class="all_network">
-      {{ 'filter.network_all'|trans({}, 'userui') }}
-    </a>
-  </li>
+  {% if app.user %}
+    <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
+      <a id="link_all_network" href="{{ path('home') }}" class="all_network">
+        {{ 'filter.network_all'|trans({}, 'userui') }}
+      </a>
+    </li>
+  {% else %}
+    <li class="{% if network_public == '1' and not ids_display %}selected{% endif %}">
+      <a href="{{ path('home') }}" >
+        {{ 'filter.network_all'|trans({}, 'userui') }}
+      </a>
+    </li>
+  {% endif %}
   <li class="separator"></li>
-  <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
-    <a id="link_my_network" href="{{ path('mynetwork_home') }}" class="my_network" >
-      {{ 'filter.network_my'|trans({}, 'userui') }}
-    </a>
-  </li>
+  {% if app.user %}
+    <li class="{% if network_public == '0' and not ids_display %}selected{% endif %}">
+      <a id="link_my_network" href="{{ path('mynetwork_home') }}" class="my_network" >
+        {{ 'filter.network_my'|trans({}, 'userui') }}
+      </a>
+    </li>
+  {% else %}
+    <li>
+      <a id="link_my_network" href="#" class="mustbeconnected" >
+        {{ 'filter.network_my'|trans({}, 'userui') }}
+      </a>
+    </li>
+  {% endif %}
   <li class="separator"></li>
-  <li class="{% if app.request.get('topmenu') == 'showuser' and app.request.get('slug') == app.user.slug %}selected{% endif %}">
-    <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-      {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
-    </a>
-  </li>
+  {% if app.user %}
+    <li class="{% if app.request.get('topmenu') == 'showuser' and app.request.get('slug') == app.user.slug %}selected{% endif %}">
+      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% else %}
+    <li>
+      <a href="#" class="mustbeconnected">
+        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% endif %}
   <li class="separator"></li>
-  {% if his_group is not defined %}{% set his_group = false %}{% endif %}
-  <li class="{% if app.request.get('topmenu') == 'mygroups' or his_group == true %}selected{% endif %}">
-    <a href="{{ path('groups_own_list') }}" >
-      {{ 'network.mygroups'|trans({}, 'navigationui') }}
-    </a>
-  </li>
+  {% if app.user %}
+    {% if his_group is not defined %}{% set his_group = false %}{% endif %}
+    <li class="{% if app.request.get('topmenu') == 'mygroups' or his_group == true %}selected{% endif %}">
+      <a href="{{ path('groups_own_list') }}" >
+        {{ 'network.mygroups'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% else %}
+    <li>
+      <a href="#" class="mustbeconnected">
+        {{ 'network.mygroups'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% endif %}
   <li class="separator"></li>
-  <li class="{% if app.request.get('topmenu') == 'myfavorites' %}selected{% endif %}">
-    <a href="{{ path('favorites_my_list') }}" >
-      {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
-    </a>
-  </li>
+  {% if app.user %}
+    <li class="{% if app.request.get('topmenu') == 'myfavorites' %}selected{% endif %}">
+      <a href="{{ path('favorites_my_list') }}" >
+        {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% else %}
+    <li>
+      <a href="#" class="mustbeconnected">
+        {{ 'container_menu.my_favorites'|trans({}, 'navigationui') }}
+      </a>
+    </li>
+  {% endif %}
 </ul>

src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig

@@ -56,34 +56,46 @@
           {{ element.points|format_score }}
         </li>
             <li class="vote thumb">
-              {% if element.owner.id != app.user.id %}
-                {% if element.hasVoteGood(app.user.id) %}
-                  <a class="vote" href="{{ path('ajax_element_remove_vote_good', {
-                    'element_id' : element.id,
-                    'token'      : app.user.getPersonalHash(element.id)
-                  }) }}" title="{{ 'element.vote.good'|trans({}, 'elements') }}">
-                    <img src="{{ asset('img/icon_thumb_red.png') }}" alt="vote" />
-                  </a>
+              {% if app.user %}
+                {% if element.owner.id != app.user.id %}
+                  {% if element.hasVoteGood(app.user.id) %}
+                    <a class="vote" href="{{ path('ajax_element_remove_vote_good', {
+                      'element_id' : element.id,
+                      'token'      : app.user.getPersonalHash(element.id)
+                    }) }}" title="{{ 'element.vote.good'|trans({}, 'elements') }}">
+                      <img src="{{ asset('img/icon_thumb_red.png') }}" alt="vote" />
+                    </a>
+                  {% else %}
+                    <a class="vote" href="{{ path('ajax_element_add_vote_good', {
+                      'element_id' : element.id,
+                      'token'      : app.user.getPersonalHash(element.id)
+                    }) }}" title="{{ 'element.vote.good'|trans({}, 'elements') }}">
+                      <img src="{{ asset('img/icon_thumb.png') }}" alt="vote" />
+                    </a>
+                  {% endif %}
                 {% else %}
-                  <a class="vote" href="{{ path('ajax_element_add_vote_good', {
-                    'element_id' : element.id,
-                    'token'      : app.user.getPersonalHash(element.id)
-                  }) }}" title="{{ 'element.vote.good'|trans({}, 'elements') }}">
-                    <img src="{{ asset('img/icon_thumb.png') }}" alt="vote" />
-                  </a>
+                  <img src="{{ asset('img/icon_thumb_gray.png') }}" alt="vote" />
                 {% endif %}
               {% else %}
-                <img src="{{ asset('img/icon_thumb_gray.png') }}" alt="vote" />
+                <a href="#" class="mustbeconnected">
+                  <img src="{{ asset('img/icon_thumb.png') }}" alt="vote" />
+                </a>
               {% endif %}
             </li>
         <li class="star">
-          {% if element.hasFavoriteUser(app.user.id) %}
-            <a class="favorite_link" href="{{ path('favorite_remove', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
-              <img id="favorite_{{ element.id }}_is" src="{{ asset('img/icon_star_2_red.png') }}" title="{{ 'element.favorite.remove'|trans({}, 'elements') }}" alt="{{ 'element.favorite.remove'|trans({}, 'elements') }}"/>
-            </a>
+          {% if app.user %}
+            {% if element.hasFavoriteUser(app.user.id) %}
+              <a class="favorite_link" href="{{ path('favorite_remove', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
+                <img id="favorite_{{ element.id }}_is" src="{{ asset('img/icon_star_2_red.png') }}" title="{{ 'element.favorite.remove'|trans({}, 'elements') }}" alt="{{ 'element.favorite.remove'|trans({}, 'elements') }}"/>
+              </a>
+            {% else %}
+              <a class="favorite_link" href="{{ path('favorite_add', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
+                <img id="favorite_{{ element.id }}_isnot" src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
+              </a>
+            {% endif %}
           {% else %}
-            <a class="favorite_link" href="{{ path('favorite_add', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
-              <img id="favorite_{{ element.id }}_isnot" src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
+            <a class="mustbeconnected" href="#" >
+              <img src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
             </a>
           {% endif %}
         </li>
@@ -149,68 +161,96 @@
           </li>
         {% endif %}
         
-        {% if app.user.id != element.owner.id %}
-      
-          {% if display_edit_actions %}
-            <li class="element_propose_tags">
-              <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
-                class="element_propose_tags" 
-                href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
-                <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
-              </a>
-            </li>
-
-            <li class="element_reshare">
-              <a title="{{ 'element.reshare.link_title'|trans({}, 'userui') }}" 
-                class="element_reshare" 
-                href="{{ path('ajax_reshare_element', {'element_id':element.id, 'token':app.user.getPersonalHash('reshare_'~element.id)}) }}">
-                <img src="{{ asset('/img/icon_reload.png') }}" alt="re" />
-              </a>
-            </li>
-            
-            <li class="element_report">
-              <a title="{{ 'element.report.link_title'|trans({}, 'userui') }}" 
-                class="element_report" 
-                href="{{ path('ajax_report_element', {'element_id':element.id, 'token':app.user.getPersonalHash(element.id)}) }}">
-                <img src="{{ asset('/img/icon_alert.png') }}" alt="report" />
-              </a>
-            </li>
-
+        {% if app.user %}
+          {% if app.user.id != element.owner.id %}
+        
+            {% if display_edit_actions %}
+              <li class="element_propose_tags">
+                <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
+                  class="element_propose_tags" 
+                  href="{{ path('ajax_element_propose_tags_open', {'element_id' : element.id}) }}">
+                  <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
+                </a>
+              </li>
+  
+              <li class="element_reshare">
+                <a title="{{ 'element.reshare.link_title'|trans({}, 'userui') }}" 
+                  class="element_reshare" 
+                  href="{{ path('ajax_reshare_element', {'element_id':element.id, 'token':app.user.getPersonalHash('reshare_'~element.id)}) }}">
+                  <img src="{{ asset('/img/icon_reload.png') }}" alt="re" />
+                </a>
+              </li>
+              
+              <li class="element_report">
+                <a title="{{ 'element.report.link_title'|trans({}, 'userui') }}" 
+                  class="element_report" 
+                  href="{{ path('ajax_report_element', {'element_id':element.id, 'token':app.user.getPersonalHash(element.id)}) }}">
+                  <img src="{{ asset('/img/icon_alert.png') }}" alt="report" />
+                </a>
+              </li>
+  
+            {% endif %}
+  
           {% endif %}
 
-        {% endif %}
-
-        {% if app.user.id == element.owner.id %}
-
-          {% if display_edit_actions %}
-
-            {% if element.hasTagProposition %}
-              <li class="element_view_propositions_link">
-                <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
-                  href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
+          {% if app.user.id == element.owner.id %}
+  
+            {% if display_edit_actions %}
+  
+              {% if element.hasTagProposition %}
+                <li class="element_view_propositions_link">
+                  <a title="{{ 'element.view_propositions.link'|trans({}, 'elements') }}" class="element_view_propositions_link" 
+                    href="{{ path('ajax_element_proposed_tags_view', {'element_id' : element.id})  }}"
+                  >
+                    <img src="{{ asset('bundles/muzichcore/img/1333493527_tag_add.png') }}" alt="tags proposition" />
+                  </a>
+                </li>
+              {% endif %}
+  
+              <li class="element_edit_link">
+                <a title="{{ 'element.edit.link'|trans({}, 'elements') }}" class="element_edit_link" 
+                  href="{{ path('element_edit', {'element_id' : element.id})  }}"
                 >
-                  <img src="{{ asset('bundles/muzichcore/img/1333493527_tag_add.png') }}" alt="tags proposition" />
+                  <img src="{{ asset('/img/icon_pen.png') }}" alt="edit" />
+                </a>
+              </li>
+  
+              <li class="element_remove_link">
+                <a title="{{ 'element.remove.link'|trans({}, 'elements') }}" class="element_remove_link" 
+                  href="{{ path('element_remove', {'element_id' : element.id, 'token':app.user.getPersonalHash(element.id)})  }}"
+                >
+                  <img src="{{ asset('/img/icon_close_2.png') }}" alt="delete" />
                 </a>
               </li>
             {% endif %}
-
-            <li class="element_edit_link">
-              <a title="{{ 'element.edit.link'|trans({}, 'elements') }}" class="element_edit_link" 
-                href="{{ path('element_edit', {'element_id' : element.id})  }}"
-              >
-                <img src="{{ asset('/img/icon_pen.png') }}" alt="edit" />
-              </a>
-            </li>
-
-            <li class="element_remove_link">
-              <a title="{{ 'element.remove.link'|trans({}, 'elements') }}" class="element_remove_link" 
-                href="{{ path('element_remove', {'element_id' : element.id, 'token':app.user.getPersonalHash(element.id)})  }}"
-              >
-                <img src="{{ asset('/img/icon_close_2.png') }}" alt="delete" />
-              </a>
-            </li>
+  
           {% endif %}
+        {% else %}
+          
+          <li class="element_propose_tags">
+            <a title="{{ 'element.proposition_tags.link_title'|trans({}, 'userui') }}" 
+              class="mustbeconnected" 
+              href="#">
+              <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags_proposition" />
+            </a>
+          </li>
 
+          <li class="element_reshare">
+            <a title="{{ 'element.reshare.link_title'|trans({}, 'userui') }}" 
+              class="mustbeconnected" 
+              href="#">
+              <img src="{{ asset('/img/icon_reload.png') }}" alt="re" />
+            </a>
+          </li>
+          
+          <li class="element_report">
+            <a title="{{ 'element.report.link_title'|trans({}, 'userui') }}" 
+              class="mustbeconnected" 
+              href="#">
+              <img src="{{ asset('/img/icon_alert.png') }}" alt="report" />
+            </a>
+          </li>
+          
         {% endif %}
         
         {% if his_group %}
@@ -275,22 +315,33 @@
         {% for tag in element.tags %} 
           <li class="element_tag">
             <a id="element_tag_{{ tag.id }}" href="#" 
-              class="element_tag button {% if app.user.haveTagsFavorite(tag.id) %}element_tag_large_for_fav_still{% endif %}"
+              class="element_tag button {% if app.user %}{% if app.user.haveTagsFavorite(tag.id) %}element_tag_large_for_fav_still{% endif %}{% endif %}"
             >
               {{ tag.name }}
             </a>
-            {% if app.user.haveTagsFavorite(tag.id) %}
-              <img class="tag_to_favorites" src="{{ asset('/img/icon_heart.png') }}" 
-                alt="add-to-favorites"
-                title="{{ 'element.tag.isfav.title'|trans({'%tagname%':tag.name}, 'elements') }}"
-              />
+            {% if app.user %}
+              {% if app.user.haveTagsFavorite(tag.id) %}
+                <img class="tag_to_favorites" src="{{ asset('/img/icon_heart.png') }}" 
+                  alt="add-to-favorites"
+                  title="{{ 'element.tag.isfav.title'|trans({'%tagname%':tag.name}, 'elements') }}"
+                />
+              {% else %}
+                <a 
+                  href="{{ path('ajax_tag_add_to_favorites', {
+                    'tag_id' : tag.id,
+                    'token'  : app.user.getPersonalHash(tag.id)
+                  }) }}" 
+                  class="tag_to_favorites" 
+                  style="display: none;"
+                  title="{{ 'element.tag.addtofav.title'|trans({}, 'elements') }}"   
+                >
+                  <img class="tag_add_to_favorites"  src="{{ asset('/img/icon_heart.png') }}" alt="add-to-favorites"/>
+                </a>
+              {% endif %}
             {% else %}
               <a 
-                href="{{ path('ajax_tag_add_to_favorites', {
-                  'tag_id' : tag.id,
-                  'token'  : app.user.getPersonalHash(tag.id)
-                }) }}" 
-                class="tag_to_favorites" 
+                href="#" 
+                class="tag_to_favorites mustbeconnected" 
                 style="display: none;"
                 title="{{ 'element.tag.addtofav.title'|trans({}, 'elements') }}"   
               >
@@ -325,10 +376,16 @@
             </a>
           {%endif %}
         {% endautoescape %}
-
-        <a href="#add_comment_{{ element.id }}" class="add_comment">
-          {{ 'element.comments.add'|trans({}, 'elements') }}
-        </a>
+        
+        {% if app.user %}
+          <a href="#add_comment_{{ element.id }}" class="add_comment">
+            {{ 'element.comments.add'|trans({}, 'elements') }}
+          </a>
+        {% else %}
+          <a href="#" class="mustbeconnected add_comment_disabled">
+            {{ 'element.comments.add'|trans({}, 'elements') }}
+          </a>
+        {% endif %}
       
       {% endif %}
       
@@ -366,21 +423,23 @@
     <div class="comments_loader">
       <img class="comments_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading"/>
     </div>
-      
-    <form 
-      action="{{ path('ajax_add_comment', {'element_id':element.id, 'token':app.user.getPersonalHash(element.id)}) }}" 
-      method="post" 
-      name="add_comment"
-      style="display: none;"
-      class="add_comment"
-    >
-      {% include "MuzichCommentBundle:Comment:form.html.twig" with {
-        'submit_value' : 'element.comments.add_submit'|trans({}, 'elements'),
-        'cancel_value' : 'element.comments.add_cancel'|trans({}, 'elements'),
-        'following'    : element.userFollowComments(app.user.id),
-        'own'          : (app.user.id == element.owner.id)
-      } %}
-    </form>
+    
+    {% if app.user %}
+      <form 
+        action="{{ path('ajax_add_comment', {'element_id':element.id, 'token':app.user.getPersonalHash(element.id)}) }}" 
+        method="post" 
+        name="add_comment"
+        style="display: none;"
+        class="add_comment"
+      >
+        {% include "MuzichCommentBundle:Comment:form.html.twig" with {
+          'submit_value' : 'element.comments.add_submit'|trans({}, 'elements'),
+          'cancel_value' : 'element.comments.add_cancel'|trans({}, 'elements'),
+          'following'    : element.userFollowComments(app.user.id),
+          'own'          : (app.user.id == element.owner.id)
+        } %}
+      </form>
+    {% endif %}
       
     <a href="#add_comment_{{ element.id }}" class="add_comment">
       {{ 'element.comments.add'|trans({}, 'elements') }}

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -143,7 +143,7 @@ class ElementSearcherQueryBuilder
   
   private function buildNetwork()
   {
-    if ($this->es->getNetwork() == ElementSearcher::NETWORK_PERSONAL)
+    if ($this->es->getNetwork() == ElementSearcher::NETWORK_PERSONAL && $this->user_id)
     {
       $this->query_ids
         ->join('e.owner', 'o')
@@ -222,15 +222,18 @@ class ElementSearcherQueryBuilder
       // On a besoin de récupérer la liste des element_id qui ont les tags
       // demandés.
       $tag_ids = '';
-      foreach ($tags as $tag_id => $tag_name)
+      if (count($tags))
       {
-        if ($tag_ids === '')
-        {
-          $tag_ids .= (int)$tag_id;
-        }
-        else
+        foreach ($tags as $tag_id => $tag_name)
         {
-          $tag_ids .= ','.(int)$tag_id;
+          if ($tag_ids === '')
+          {
+            $tag_ids .= (int)$tag_id;
+          }
+          else
+          {
+            $tag_ids .= ','.(int)$tag_id;
+          }
         }
       }
       
@@ -383,21 +386,46 @@ class ElementSearcherQueryBuilder
     }
     
     // On prépare des paramètres de la requete d'éléments
-    $this->parameters_elements['uidt'] = '%"'. $this->user_id.'"%';
-    $this->parameters_elements['uid']  =  $this->user_id;
     $this->parameters_elements['ids']  = $element_ids;
     
     // On prépare la requete des elements
-    $this->query_elements = $this->em->createQueryBuilder()
-      ->select('e', 'p', 'po', 't', 'o', 'g', 'fav')
+    $this->query_elements = $this->em->createQueryBuilder();
+    
+    if ($this->user_id)
+    {
+      $this->query_elements->select('e', 'p', 'po', 't', 'o', 'g', 'fav');
+    }
+    else{
+      $this->query_elements->select('e', 'p', 'po', 't', 'o', 'g');
+    }
+    
+    $this->query_elements
       ->from('MuzichCoreBundle:Element', 'e')
       ->leftJoin('e.group', 'g')
       ->leftJoin('e.parent', 'p')
       ->leftJoin('p.owner', 'po')
-      ->leftJoin('e.tags', 't', Join::WITH, 
-        "(t.tomoderate = 'FALSE' OR t.tomoderate IS NULL OR t.privateids LIKE :uidt)")
-      ->leftJoin('e.elements_favorites', 'fav', Join::WITH,
-        'fav.user = :uid')
+    ;
+    
+    if ($this->user_id)
+    {
+      $this->parameters_elements['uidt'] = '%"'. $this->user_id.'"%';
+      $this->parameters_elements['uid']  =  $this->user_id;
+      $this->query_elements
+        ->leftJoin('e.tags', 't', Join::WITH, 
+          "(t.tomoderate = 'FALSE' OR t.tomoderate IS NULL OR t.privateids LIKE :uidt)")
+        ->leftJoin('e.elements_favorites', 'fav', Join::WITH,
+          'fav.user = :uid')
+      ;
+    }
+    else
+    {
+      $this->query_elements
+        ->leftJoin('e.tags', 't', Join::WITH, 
+          "(t.tomoderate = 'FALSE' OR t.tomoderate IS NULL)")
+      ;
+    }
+    
+    $this->query_elements
       ->join('e.owner', 'o')
       ->where('e.id IN (:ids)')
       ->orderBy("e.created", 'DESC')

src/Muzich/CoreBundle/Util/TagLike.php

@@ -167,13 +167,19 @@ class TagLike
       $params['str'.$i] = '%'.$word.'%';
     }
 
-    $params['uid'] = '%"'.$user_id.'"%';
+    $private_tags_sql = '';
+    if ($user_id)
+    {
+      $params['uid'] = '%"'.$user_id.'"%';
+      $private_tags_sql = 'OR t.privateids LIKE :uid';
+    }
+    
     $tags_query = $this->entity_manager->createQuery("
       SELECT t.name, t.slug, t.id FROM MuzichCoreBundle:Tag t
       $where
 
       AND (t.tomoderate = '0' OR t.tomoderate IS NULL
-      OR t.privateids LIKE :uid)
+      $private_tags_sql)
 
       ORDER BY t.name ASC"
     )

src/Muzich/CoreBundle/lib/Controller.php

@@ -11,6 +11,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Muzich\CoreBundle\Searcher\GlobalSearcher;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Entity\Presubscription;
+use Muzich\CoreBundle\Entity\User;
 
 class Controller extends BaseController
 {
@@ -46,6 +47,21 @@ class Controller extends BaseController
     $this->get("session")->set('user.element_search.params'.$session_id, $params);
   }
   
+  protected function isVisitor()
+  {
+    $user = $this->getUser();
+    if ($user === 'anon.')
+    {
+      return true;
+    }
+    elseif ($user instanceof User)
+    {
+      return true;
+    }
+    
+    throw new \Exception('Unable to determine user type');
+  }
+  
   /**
    * Retourn l'objet ElementSearcher en cours.
    * 
@@ -70,11 +86,7 @@ class Controller extends BaseController
       // Premièrement on récupère les tags favoris de l'utilisateur
       $this->ElementSearcher = new ElementSearcher();
       $this->ElementSearcher->init(array(
-        'tags' => $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-          ->getTagsFavorites(
-            $this->getUserId(),
-            $this->container->getParameter('search_default_favorites_tags_count')
-          ),
+        'tags' => $this->getUserFavoriteTags(),
         'count' => ($count)?$count:$this->container->getParameter('search_default_count')
       ));
 
@@ -97,6 +109,21 @@ class Controller extends BaseController
     return $this->ElementSearcher;
   }
   
+  protected function getUserFavoriteTags()
+  {
+    if (!$this->isVisitor())
+    {
+      return $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
+        ->getTagsFavorites(
+          $this->getUserId(),
+          $this->container->getParameter('search_default_favorites_tags_count')
+        )
+      ;
+    }
+    
+    return array();
+  }
+  
   protected function getNewElementSearcher()
   {
     return $this->getElementSearcher(null, true);
@@ -142,11 +169,19 @@ class Controller extends BaseController
       // on va le récupérer en base.
       if ($force_refresh || !self::$user_personal_query)
       {
-        self::$user_personal_query = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
-          $this->container->get('security.context')->getToken()->getUser()->getId(),
-          array_key_exists('join', $params) ? $params['join'] : array()
-        )->getSingleResult();
-        return self::$user_personal_query;
+        $user = $this->container->get('security.context')->getToken()->getUser();
+        if ($user !== 'anon.')
+        {
+          self::$user_personal_query = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+            $this->container->get('security.context')->getToken()->getUser()->getId(),
+            array_key_exists('join', $params) ? $params['join'] : array()
+          )->getSingleResult();
+          return self::$user_personal_query;
+        }
+        else
+        {
+          return 'anon.';
+        }
       }
       return self::$user_personal_query;
     }
@@ -155,25 +190,40 @@ class Controller extends BaseController
   /**
    *  Retourne l'id de l'utilisateur en cours
    */
-  protected function getUserId()
+  protected function getUserId($return_null_if_visitor = false)
   {
+    
     /**
      * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
      * Docrine le voit si on faire une requete directe.
      */
     if ($this->container->getParameter('env') == 'test')
     {
-      $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
-        $this->container->get('security.context')->getToken()->getUser()->getId(),
-        array()
-      )->getSingleResult();
-      return $user->getId();
+      $user_context = $this->container->get('security.context')->getToken()->getUser();
+      
+      if ($user_context !== 'anon.')
+      {
+        $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
+          $user_context,
+          array()
+        )->getSingleResult();
+      }
+    }
+    else
+    {
+      $user = $this->getUser();
     }
     
-    if (($user = $this->getUser()) != 'anon.')
+    if ($user !== 'anon.')
     {
       return $user->getId();
     }
+    
+    if ($return_null_if_visitor)
+    {
+      return null;
+    }
+    
     throw new \Exception('User not connected');
   }
   

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -25,7 +25,7 @@ class HomeController extends Controller
     $search_form = $this->getSearchForm($search_object);
     $add_form = $this->getAddForm();
     
-    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     //$count_elements = count($elements);
         
     return array(

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -12,8 +12,10 @@
     'box_title': 'home.add_element_box.title'|trans({}, 'navigationui')
   } %}
 
-  {% if app.user.wantSeeHelp('home') %}
-    {% include 'MuzichCoreBundle:HelpTour:home.html.twig' %}
+  {% if app.user %}
+    {% if app.user.wantSeeHelp('home') %}
+      {% include 'MuzichCoreBundle:HelpTour:home.html.twig' %}
+    {% endif %}
   {% endif %}
 
   {# TODO: Cette partie de javascript ne devra plus exister après la réecriture du code javascript #}

src/Muzich/IndexBundle/Resources/views/Index/index.html.twig

@@ -4,7 +4,6 @@
 {% block mainbox_classes %}mainbox_margintop mainbox_padding{% endblock %}
 
 {% block sidebar_top %}
-  {% include 'MuzichIndexBundle:Index:presubscription.html.twig' %}
 {% endblock %}
 
 {% block content %}