Evolution #711: Anonyme: page profil user & user favoris

composer.json

@@ -26,7 +26,7 @@
         "doctrine/doctrine-fixtures-bundle": "dev-master",
         "stof/doctrine-extensions-bundle": "dev-master",  
         "gregwar/image-bundle": "dev-master",
-        "cedriclombardot/admingenerator-generator-bundle": "1.0.*@dev",
+        "cedriclombardot/admingenerator-generator-bundle": "2.1.*@dev",
         "cedriclombardot/twig-generator": "dev-master",
         "white-october/pagerfanta-bundle": "1.0.*@dev",
         "pagerfanta/pagerfanta": "1.0.*@dev",

composer.lock

@@ -1,19 +1,19 @@
 {
-    "hash": "de4530fc22c2b2f2da7b60c62cbf96f6",
+    "hash": "dd5c41c30319b0b4e3eff5370c6bedd2",
     "packages": [
         {
             "name": "cedriclombardot/admingenerator-generator-bundle",
-            "version": "dev-master",
+            "version": "2.1.x-dev",
             "target-dir": "Admingenerator/GeneratorBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
-                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2"
+                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
-                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
+                "reference": "1b2ea73c01a5b3d39ae8dd545e46966b5bb1a1e3",
                 "shasum": ""
             },
             "require": {
@@ -33,7 +33,7 @@
                 "avalanche123/imagine-bundle": "Image manipulation using Imagine and Twig Filters",
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
             },
-            "time": "2013-04-23 06:32:11",
+            "time": "2013-04-14 09:22:28",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -167,7 +167,7 @@
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -375,21 +375,21 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
-                "reference": "275540d96599baec19fa3292c4d06c5cd4eefd06"
+                "reference": "5696cd636df7cbfaf4d1c45ed2922438968cf890"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/275540d96599baec19fa3292c4d06c5cd4eefd06",
-                "reference": "275540d96599baec19fa3292c4d06c5cd4eefd06",
+                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/5696cd636df7cbfaf4d1c45ed2922438968cf890",
+                "reference": "5696cd636df7cbfaf4d1c45ed2922438968cf890",
                 "shasum": ""
             },
             "require": {
                 "doctrine/data-fixtures": "*",
                 "doctrine/doctrine-bundle": ">=1.0,<2.0",
                 "php": ">=5.3.2",
-                "symfony/doctrine-bridge": ">=2.1.0,<2.3-dev"
+                "symfony/doctrine-bridge": ">=2.1.0,<2.4-dev"
             },
-            "time": "2013-02-12 11:13:27",
+            "time": "2013-04-27 11:57:35",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -686,22 +686,25 @@
         },
         {
             "name": "jdorn/sql-formatter",
-            "version": "v1.2.0",
+            "version": "v1.2.9",
             "source": {
                 "type": "git",
-                "url": "git://github.com/jdorn/sql-formatter.git",
-                "reference": "v1.2.0"
+                "url": "https://github.com/jdorn/sql-formatter.git",
+                "reference": "v1.2.9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/jdorn/sql-formatter/archive/v1.2.0.zip",
-                "reference": "v1.2.0",
+                "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/v1.2.9",
+                "reference": "v1.2.9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2012-12-22 21:46:50",
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*"
+            },
+            "time": "2013-04-26 18:42:52",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -715,7 +718,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL"
+                "MIT"
             ],
             "authors": [
                 {
@@ -765,7 +768,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -866,7 +869,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -909,7 +912,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -972,7 +975,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -1105,12 +1108,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kriswallsmith/assetic.git",
-                "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371"
+                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/0a55a9ba70bd9250899ad77deceaf8cb9e145371",
-                "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371",
+                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/1b17f9a239276f24344f9f7d7be8293f6dca4e19",
+                "reference": "1b17f9a239276f24344f9f7d7be8293f6dca4e19",
                 "shasum": ""
             },
             "require": {
@@ -1136,7 +1139,7 @@
                 "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
                 "twig/twig": "Assetic provides the integration with the Twig templating engine"
             },
-            "time": "2013-04-02 21:36:28",
+            "time": "2013-04-27 14:32:20",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1483,12 +1486,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "041174991a1d3c6725e1603c389b5767261972c7"
+                "reference": "c611614f23d5d42257747ae81bcc36df86216bae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/041174991a1d3c6725e1603c389b5767261972c7",
-                "reference": "041174991a1d3c6725e1603c389b5767261972c7",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/c611614f23d5d42257747ae81bcc36df86216bae",
+                "reference": "c611614f23d5d42257747ae81bcc36df86216bae",
                 "shasum": ""
             },
             "require": {
@@ -1515,7 +1518,7 @@
                 "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
                 "sonata-project/intl-bundle": "2.1.*"
             },
-            "time": "2013-04-11 21:38:12",
+            "time": "2013-05-03 19:57:10",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1540,7 +1543,7 @@
                 },
                 {
                     "name": "Sonata Community",
-                    "homepage": "https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/contributors"
+                    "homepage": "https://github.com/sonata-project/SonataAdminBundle/contributors"
                 }
             ],
             "description": "Symfony SonataAdminBundle",

src/Muzich/CoreBundle/Repository/GroupRepository.php

@@ -79,16 +79,24 @@ class GroupRepository extends EntityRepository
    */
   public function getElementsTags($group_id, $current_user_id)
   {
+    $parameters = array('gid' => $group_id);
+    $current_user_sql = '';
+    if ($current_user_id)
+    {
+      $parameters['uidt'] = '%"'.$current_user_id.'"%';
+      $current_user_sql = 'OR t.privateids LIKE :uidt';
+    }
+    
     return $this->getEntityManager()
       ->createQuery('
         SELECT t FROM MuzichCoreBundle:Tag t
         LEFT JOIN t.elements e
         WHERE e.group = :gid
         AND (t.tomoderate = \'FALSE\' OR t.tomoderate IS NULL
-          OR t.privateids LIKE :uidt)
+          '.$current_user_sql.')
         ORDER BY t.name ASC'
       )
-      ->setParameters(array('gid' => $group_id, 'uidt' => '%"'.$current_user_id.'"%'))
+      ->setParameters($parameters)
       ->getResult()
     ;
   }

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -194,16 +194,24 @@ class UserRepository extends EntityRepository
    */
   public function getElementsTags($user_id, $current_user_id)
   {
+    $parameters = array('uid' => $user_id);
+    $current_user_sql = '';
+    if ($current_user_id)
+    {
+      $parameters['uidt'] = '%"'.$current_user_id.'"%';
+      $current_user_sql = 'OR t.privateids LIKE :uidt';
+    }
+    
     return $this->getEntityManager()
       ->createQuery('
         SELECT t FROM MuzichCoreBundle:Tag t
         LEFT JOIN t.elements e
         WHERE e.owner = :uid
         AND (t.tomoderate = \'FALSE\' OR t.tomoderate IS NULL
-          OR t.privateids LIKE :uidt)
+          '.$current_user_sql.')
         ORDER BY t.name ASC'
       )
-      ->setParameters(array('uid' => $user_id, 'uidt' => '%"'.$current_user_id.'"%'))
+      ->setParameters($parameters)
       ->getResult()
     ;
   }

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

@@ -96,6 +96,10 @@ security:
         - { path: ^/(?:fr|en)$, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/$, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/$, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^//user, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(?:fr|en)/user, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^//group, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(?:fr|en)/group, role: IS_AUTHENTICATED_ANONYMOUSLY }
                                         
         - { path: ^/, roles: ROLE_USER }
         

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -212,7 +212,7 @@ class FavoriteController extends Controller
     ));
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($viewed_user->getId(), $this->getUserId())      
+      ->getTags($viewed_user->getId(), $this->getUserId(true))      
     ;
     
     $tags_id = array();
@@ -226,19 +226,14 @@ class FavoriteController extends Controller
       'tags_id_json'  => json_encode($tags_id),
       'user'          => $this->getUser(),
       'viewed_user'   => $viewed_user,
-      'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId())
+      'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId(true))
     );
   }
   
   public function getElementsAction($user_id, $tags_ids_json, $id_limit = null)
   {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
     $autoplay_context = 'favorite_user';
-    if ($user_id == $this->getUserId())
+    if ($user_id == $this->getUserId(true))
     {
       $autoplay_context = 'favorite_my';
     }
@@ -272,13 +267,13 @@ class FavoriteController extends Controller
     );
     
     $viewed_user = $this->getUser();
-    if ($user_id != $this->getUserId())
+    if ($user_id != $this->getUserId(true))
     {
       $viewed_user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
         ->findOneById($user_id, array())->getSingleResult();
     }
     
-    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     $count = count($elements);
     $html = '';
     if ($count)

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -29,7 +29,7 @@ class ShowController extends Controller
     ));
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($viewed_user->getId(), $this->getUserId())      
+      ->getElementsTags($viewed_user->getId(), $this->getUserId(true))      
     ;
     
     // Organisation des tags en fonction de leurs utilisation
@@ -63,17 +63,17 @@ class ShowController extends Controller
       'tags'            => $tags,
       'tags_id_json'    => json_encode($tags_id),
       'viewed_user'     => $viewed_user,
-      'elements'        => $search_object->getElements($this->getDoctrine(), $this->getUserId()),
-      'following'       => $this->getUser()->isFollowingUserByQuery($this->getDoctrine(), $viewed_user->getId()),
+      'elements'        => $search_object->getElements($this->getDoctrine(), $this->getUserId(true)),
+      'following'       => (!$this->isVisitor())?$this->getUser()->isFollowingUserByQuery($this->getDoctrine(), $viewed_user->getId()):false,
       'user'            => $this->getUser(),
       'more_count'      => ($count)?$count+$this->container->getParameter('search_default_count'):$this->container->getParameter('search_default_count')*2,
       'more_route'      => 'show_user_more',
-      'topmenu_active'  => ($viewed_user->getId() == $this->getUserId()) ? 'myfeeds' : 'public',
+      'topmenu_active'  => ($viewed_user->getId() == $this->getUserId(true)) ? 'myfeeds' : 'public',
       'count_owned'     => count($element_ids_owned),
       'count_favorited' => $count_favorited,
       'count_favorited_users' => $count_favorited_users,
       'count_followers' => $count_followers,
-      'add_form'        => ($this->getUserId() == $viewed_user->getId())?$this->getAddForm()->createView():null,
+      'add_form'        => ($this->getUserId(true) == $viewed_user->getId())?$this->getAddForm()->createView():null,
       'add_form_name'   => 'add'
     );
   }
@@ -93,14 +93,14 @@ class ShowController extends Controller
       'count'     => ($count)?$count:$this->container->getParameter('search_default_count')
     ));
     
-    ($group->getOwner()->getId() == $this->getUserId()) ? $his = true : $his = false;
+    ($group->getOwner()->getId() == $this->getUserId(true)) ? $his = true : $his = false;
     if ($his || $group->getOpen())
     {      
       $add_form = $this->getAddForm();
     }
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')
-      ->getElementsTags($group->getId(), $this->getUserId())      
+      ->getElementsTags($group->getId(), $this->getUserId(true))      
     ;
     
     $tags_id = array();
@@ -129,9 +129,9 @@ class ShowController extends Controller
       'tags'          => $tags,
       'tags_id_json'  => json_encode($tags_id),
       'group'         => $group,
-      'his_group'     => ($group->getOwner()->getId() == $this->getUserId()) ? true : false,
-      'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId()),
-      'following'     => $this->getUser()->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()),
+      'his_group'     => ($group->getOwner()->getId() == $this->getUserId(true)) ? true : false,
+      'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId(true)),
+      'following'     => (!$this->isVisitor())?$this->getUser()->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()):false,
       'user'          => $this->getUser(),
       'add_form'      => (isset($add_form)) ? $add_form->createView() : null,
       'add_form_name' => (isset($add_form)) ? 'add' : null,
@@ -145,19 +145,14 @@ class ShowController extends Controller
   }
   
   public function getElementsAction($type, $object_id, $tags_ids_json, $id_limit = null)
-  {
-    if (($response = $this->mustBeConnected()))
-    {
-      return $response;
-    }
-    
+  { 
     if ($type != 'user' && $type != 'group')
     {
       throw new \Exception("Wrong Type.");
     }
     
     $viewed_user = null;
-    if ($type == 'user' && $object_id == $this->getUserId())
+    if ($type == 'user' && $object_id == $this->getUserId(true))
     {
       $object = $viewed_user = $this->getUser();
     }
@@ -199,7 +194,7 @@ class ShowController extends Controller
       'elements'
     );
     
-    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
+    $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     $count = count($elements);
     $html = '';
     if ($count)

src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig

@@ -19,14 +19,16 @@
         </a>
       {% endif %}
       
-      <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': user.personalHash(group.id) }) }}" 
-         class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}">
-        {% if following %}
-          {{ 'group.following'|trans({}, 'groups') }}
-        {% else %}
-          {{ 'group.follow'|trans({}, 'groups') }}
-        {% endif %}
-      </a>
+      {% if app.user %}
+        <a href="{{ path('follow', { 'type': 'group', 'id': group.id, 'token': app.user.personalHash(group.id) }) }}" 
+           class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}">
+          {% if following %}
+            {{ 'group.following'|trans({}, 'groups') }}
+          {% else %}
+            {{ 'group.follow'|trans({}, 'groups') }}
+          {% endif %}
+        </a>
+      {% endif %}
       
     </div>
       

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -7,21 +7,25 @@
 
   <div class="top_tools">
     
-    {% if app.user.id == viewed_user.id %}
-      {% include 'MuzichCoreBundle:Component:element_add_buttons_topright.html.twig' %}
-    {% endif %}
+    {% if app.user %}
+      {% if app.user.id == viewed_user.id %}
+        {% include 'MuzichCoreBundle:Component:element_add_buttons_topright.html.twig' %}
+      {% endif %}
+    {% endif  %}
     
     <div class="show_options">
             
-      {% if app.user.id != viewed_user.id %}
-        <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash(viewed_user.id) }) }}" 
-           class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}" >
-          {% if following %}
-            {{ 'user.following'|trans({}, 'users') }}
-          {% else %}
-            {{ 'user.follow'|trans({}, 'users') }}
-          {% endif %}
-        </a>
+      {% if app.user %}
+        {% if app.user.id != viewed_user.id %}
+          <a href="{{ path('follow', { 'type': 'user', 'id': viewed_user.id, 'token': user.personalHash(viewed_user.id) }) }}" 
+             class="follow_link button darkbutton {% if following %}following{% else %}notfollowing{% endif %}" >
+            {% if following %}
+              {{ 'user.following'|trans({}, 'users') }}
+            {% else %}
+              {{ 'user.follow'|trans({}, 'users') }}
+            {% endif %}
+          </a>
+        {% endif %}
       {% endif %}
       
       <a class="button darkbutton" href="{{ path('favorite_user_list', {'slug' : viewed_user.slug}) }}" >
@@ -32,9 +36,11 @@
     
     <h1>{{ 'user.show.title'|trans({'%name%' : viewed_user.name}, 'users') }}</h1>
   
-    {% if app.user.id == viewed_user.id %}
-      {% include 'MuzichCoreBundle:Component:element_add_box.html.twig'  %}
-    {% endif %}
+    {% if app.user %}
+      {% if app.user.id == viewed_user.id %}
+        {% include 'MuzichCoreBundle:Component:element_add_box.html.twig'  %}
+      {% endif %}
+    {% endif  %}
     
     <div class="reputation">