X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FEntryController.php;h=49714d0249cb9330e119bdf896212ed14b700bef;hb=7e63b892f9682e62f6758bb51c6912499f5bd8d1;hp=2dfe2f51379608ce87e7079276e114f4c04979b8;hpb=7812f508bcb68d9d0e1868fa568d7a435e7975b7;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 2dfe2f51..49714d02 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -6,27 +6,24 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Repository;
 use Wallabag\CoreBundle\Service\Extractor;
-use Wallabag\CoreBundle\Helper\Url;
+use Wallabag\CoreBundle\Form\Type\NewEntryType;
+use Wallabag\CoreBundle\Form\Type\EditEntryType;
 
 class EntryController extends Controller
 {
     /**
-     * @param  Request                                    $request
+     * @param Request $request
+     *
      * @Route("/new", name="new_entry")
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function addEntryAction(Request $request)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:User');
-        $user = $repository->find(1);
-        $entry = new Entry($user);
+        $entry = new Entry($this->getUser());
 
-        $form = $this->createFormBuilder($entry)
-            ->add('url', 'url')
-            ->add('save', 'submit')
-            ->getForm();
+        $form = $this->createForm(new NewEntryType(), $entry);
 
         $form->handleRequest($request);
 
@@ -54,71 +51,126 @@ class EntryController extends Controller
     }
 
     /**
-     * Shows unread entries for current user
+     * Edit an entry content.
+     *
+     * @param Request $request
+     * @param Entry   $entry
+     *
+     * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit")
      *
-     * @Route("/unread", name="unread")
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function showUnreadAction()
+    public function editEntryAction(Request $request, Entry $entry)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
-        // TODO don't give the user ID like this
-        // TODO change pagination
-        $entries = $repository->findUnreadByUser(1, 0);
+        $this->checkUserAction($entry);
+
+        $form = $this->createForm(new EditEntryType(), $entry);
+
+        $form->handleRequest($request);
+
+        if ($form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($entry);
+            $em->flush();
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'Entry updated'
+            );
+
+            return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
+        }
+
+        return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array(
+            'form' => $form->createView(),
+        ));
+    }
+
+    /**
+     * Shows unread entries for current user.
+     *
+     * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function showUnreadAction($page)
+    {
+        $entries = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findUnreadByUser($this->getUser()->getId());
+
+        $entries->setCurrentPage($page);
 
         return $this->render(
             'WallabagCoreBundle:Entry:entries.html.twig',
-            array('entries' => $entries)
+            array(
+                'entries'       => $entries,
+                'currentPage'   => $page
+            )
         );
     }
 
     /**
-     * Shows read entries for current user
+     * Shows read entries for current user.
+     *
+     * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
      *
-     * @Route("/archive", name="archive")
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function showArchiveAction()
+    public function showArchiveAction($page)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
-        // TODO don't give the user ID like this
-        // TODO change pagination
-        $entries = $repository->findArchiveByUser(1, 0);
+        $entries = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findArchiveByUser($this->getUser()->getId());
+
+        $entries->setCurrentPage($page);
 
         return $this->render(
             'WallabagCoreBundle:Entry:entries.html.twig',
-            array('entries' => $entries)
+            array(
+                'entries'       => $entries,
+                'currentPage'   => $page
+            )
         );
     }
 
     /**
-     * Shows starred entries for current user
+     * Shows starred entries for current user.
+     *
+     * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
      *
-     * @Route("/starred", name="starred")
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function showStarredAction()
+    public function showStarredAction($page)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
-        // TODO don't give the user ID like this
-        // TODO change pagination
-        $entries = $repository->findStarredByUser(1, 0);
+        $entries = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findStarredByUser($this->getUser()->getId());
+
+        $entries->setCurrentPage($page);
 
         return $this->render(
             'WallabagCoreBundle:Entry:entries.html.twig',
-            array('entries' => $entries)
+            array(
+                'entries'       => $entries,
+                'currentPage'   => $page
+            )
         );
     }
 
     /**
-     * Shows entry content
+     * Shows entry content.
+     *
+     * @param Entry $entry
      *
-     * @param  Entry                                      $entry
      * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function viewAction(Entry $entry)
     {
+        $this->checkUserAction($entry);
+
         return $this->render(
             'WallabagCoreBundle:Entry:entry.html.twig',
             array('entry' => $entry)
@@ -126,15 +178,19 @@ class EntryController extends Controller
     }
 
     /**
-     * Changes read status for an entry
+     * Changes read status for an entry.
+     *
+     * @param Request $request
+     * @param Entry   $entry
      *
-     * @param  Request                                            $request
-     * @param  Entry                                              $entry
      * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function toggleArchiveAction(Request $request, Entry $entry)
     {
+        $this->checkUserAction($entry);
+
         $entry->toggleArchive();
         $this->getDoctrine()->getManager()->flush();
 
@@ -147,15 +203,19 @@ class EntryController extends Controller
     }
 
     /**
-     * Changes favorite status for an entry
+     * Changes favorite status for an entry.
+     *
+     * @param Request $request
+     * @param Entry   $entry
      *
-     * @param  Request                                            $request
-     * @param  Entry                                              $entry
      * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function toggleStarAction(Request $request, Entry $entry)
     {
+        $this->checkUserAction($entry);
+
         $entry->toggleStar();
         $this->getDoctrine()->getManager()->flush();
 
@@ -168,18 +228,21 @@ class EntryController extends Controller
     }
 
     /**
-     * Deletes entry
+     * Deletes entry.
+     *
+     * @param Request $request
+     * @param Entry   $entry
      *
-     * @param  Request                                            $request
-     * @param  Entry                                              $entry
      * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteEntryAction(Request $request, Entry $entry)
     {
+        $this->checkUserAction($entry);
+
         $em = $this->getDoctrine()->getManager();
-        $entry->setDeleted(1);
-        $em->persist($entry);
+        $em->remove($entry);
         $em->flush();
 
         $this->get('session')->getFlashBag()->add(
@@ -189,4 +252,16 @@ class EntryController extends Controller
 
         return $this->redirect($request->headers->get('referer'));
     }
+
+    /**
+     * Check if the logged user can manage the given entry.
+     *
+     * @param Entry $entry
+     */
+    private function checkUserAction(Entry $entry)
+    {
+        if ($this->getUser()->getId() != $entry->getUser()->getId()) {
+            throw $this->createAccessDeniedException('You can not access this entry.');
+        }
+    }
 }