X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FEntryController.php;h=aa70307b15e29b930ef47726d2daad262892eaa5;hb=1930c19d8214c05ceefac5ac011a6b6e7e4a983d;hp=6326d31fc5b2f4d2073cf71430e320b1b5e55716;hpb=29c4517f7a8ed08239e5bee3d6c3fa823a83d102;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 6326d31f..aa70307b 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -2,122 +2,282 @@ namespace Wallabag\CoreBundle\Controller; +use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Wallabag\CoreBundle\Entity\Entry; -use Wallabag\CoreBundle\Repository; -use Wallabag\CoreBundle\Service\Extractor; -use Wallabag\CoreBundle\Helper\Url; +use Wallabag\CoreBundle\Filter\EntryFilterType; +use Wallabag\CoreBundle\Form\Type\EditEntryType; +use Wallabag\CoreBundle\Form\Type\NewEntryType; class EntryController extends Controller { /** - * @param Request $request - * @Route("/new", name="new_entry") + * @param Entry $entry + */ + private function updateEntry(Entry $entry) + { + try { + $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + } catch (\Exception $e) { + return false; + } + + return true; + } + + /** + * @param Request $request + * + * @Route("/new-entry", name="new_entry") + * * @return \Symfony\Component\HttpFoundation\Response */ - public function addEntryAction(Request $request) + public function addEntryFormAction(Request $request) { - $entry = new Entry(); - $entry->setUserId(1); + $entry = new Entry($this->getUser()); - $form = $this->createFormBuilder($entry) - ->add('url', 'url') - ->add('save', 'submit') - ->getForm(); + $form = $this->createForm(NewEntryType::class, $entry); $form->handleRequest($request); if ($form->isValid()) { - $content = Extractor::extract($entry->getUrl()); + // check for existing entry, if it exists, redirect to it with a message + $existingEntry = $this->get('wallabag_core.entry_repository') + ->existByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); + + if (false !== $existingEntry) { + $this->get('session')->getFlashBag()->add( + 'notice', + 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y') + ); - $entry->setTitle($content->getTitle()); - $entry->setContent($content->getBody()); + return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id']))); + } + + $this->updateEntry($entry); + $this->get('session')->getFlashBag()->add( + 'notice', + 'Entry saved' + ); + + return $this->redirect($this->generateUrl('homepage')); + } + + return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array( + 'form' => $form->createView(), + )); + } + + /** + * @param Request $request + * + * @Route("/bookmarklet", name="bookmarklet") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function addEntryViaBookmarklet(Request $request) + { + $entry = new Entry($this->getUser()); + $entry->setUrl($request->get('url')); + $this->updateEntry($entry); + + return $this->redirect($this->generateUrl('homepage')); + } + /** + * @param Request $request + * + * @Route("/new", name="new") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function addEntryAction(Request $request) + { + return $this->render('WallabagCoreBundle:Entry:new.html.twig'); + } + + /** + * Edit an entry content. + * + * @param Request $request + * @param Entry $entry + * + * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function editEntryAction(Request $request, Entry $entry) + { + $this->checkUserAction($entry); + + $form = $this->createForm(EditEntryType::class, $entry); + + $form->handleRequest($request); + + if ($form->isValid()) { $em = $this->getDoctrine()->getManager(); $em->persist($entry); $em->flush(); $this->get('session')->getFlashBag()->add( 'notice', - 'Entry saved' + 'Entry updated' ); - return $this->redirect($this->generateUrl('homepage')); + return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); } - return $this->render('WallabagCoreBundle:Entry:new.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array( 'form' => $form->createView(), )); } /** - * Shows unread entries for current user + * Shows all entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/all/list/{page}", name="all", defaults={"page" = "1"}) * - * @Route("/unread", name="unread") * @return \Symfony\Component\HttpFoundation\Response */ - public function showUnreadAction() + public function showAllAction(Request $request, $page) { - $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); - // TODO don't give the user ID like this - // TODO change pagination - $entries = $repository->findUnreadByUser(1, 0); + return $this->showEntries('all', $request, $page); + } - return $this->render( - 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) - ); + /** + * Shows unread entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"}) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showUnreadAction(Request $request, $page) + { + // load the quickstart if no entry in database + if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) { + return $this->redirect($this->generateUrl('quickstart')); + } + + return $this->showEntries('unread', $request, $page); } /** - * Shows read entries for current user + * Shows read entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"}) * - * @Route("/archive", name="archive") * @return \Symfony\Component\HttpFoundation\Response */ - public function showArchiveAction() + public function showArchiveAction(Request $request, $page) { - $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); - // TODO don't give the user ID like this - // TODO change pagination - $entries = $repository->findArchiveByUser(1, 0); + return $this->showEntries('archive', $request, $page); + } - return $this->render( - 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) - ); + /** + * Shows starred entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showStarredAction(Request $request, $page) + { + return $this->showEntries('starred', $request, $page); } /** - * Shows starred entries for current user + * Global method to retrieve entries depending on the given type + * It returns the response to be send. + * + * @param string $type Entries type: unread, starred or archive + * @param Request $request + * @param int $page * - * @Route("/starred", name="starred") * @return \Symfony\Component\HttpFoundation\Response */ - public function showStarredAction() + private function showEntries($type, Request $request, $page) { - $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); - // TODO don't give the user ID like this - // TODO change pagination - $entries = $repository->findStarredByUser(1, 0); + $repository = $this->get('wallabag_core.entry_repository'); + + switch ($type) { + case 'starred': + $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId()); + break; + + case 'archive': + $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); + break; + + case 'unread': + $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId()); + break; + + case 'all': + $qb = $repository->getBuilderForAllByUser($this->getUser()->getId()); + break; + + default: + throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); + } + + $form = $this->createForm(EntryFilterType::class); + + if ($request->query->has($form->getName())) { + // manually bind values from the request + $form->submit($request->query->get($form->getName())); + + // build the query from the given form object + $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); + } + + $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); + $entries = new Pagerfanta($pagerAdapter); + + $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); + $entries->setCurrentPage($page); return $this->render( 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) + array( + 'form' => $form->createView(), + '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) @@ -125,60 +285,105 @@ class EntryController extends Controller } /** - * Changes read status for an entry + * Reload an entry. + * Refetch content from the website and make it readable again. + * + * @param Entry $entry + * + * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry") + * + * @return \Symfony\Component\HttpFoundation\RedirectResponse + */ + public function reloadAction(Entry $entry) + { + $this->checkUserAction($entry); + + $message = 'Entry reloaded'; + if (false === $this->updateEntry($entry)) { + $message = 'Failed to reload entry'; + } + + $this->get('session')->getFlashBag()->add( + 'notice', + $message + ); + + return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + } + + /** + * 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(); $this->get('session')->getFlashBag()->add( 'notice', - 'Entry archived' + 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') ); return $this->redirect($request->headers->get('referer')); } /** - * 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(); $this->get('session')->getFlashBag()->add( 'notice', - 'Entry starred' + 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') ); return $this->redirect($request->headers->get('referer')); } /** - * Deletes entry + * Deletes entry and redirect to the homepage or the last viewed page. + * + * @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); + + // generates the view url for this entry to check for redirection later + // to avoid redirecting to the deleted entry. Ugh. + $url = $this->generateUrl( + 'view', + array('id' => $entry->getId()), + UrlGeneratorInterface::ABSOLUTE_URL + ); + $em = $this->getDoctrine()->getManager(); - $entry->setDeleted(1); - $em->persist($entry); + $em->remove($entry); $em->flush(); $this->get('session')->getFlashBag()->add( @@ -186,6 +391,19 @@ class EntryController extends Controller 'Entry deleted' ); - return $this->redirect($request->headers->get('referer')); + // don't redirect user to the deleted entry + return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage')); + } + + /** + * 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.'); + } } }