X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FEntryController.php;h=e500ad752af6f0af4e30a502542634a2bc5fafca;hb=f1be7af446052c6fed7033664c6c6350f558961b;hp=9dd904f1a5e2efd97d6bca17dc866e08724c6c25;hpb=3bcc4d4cb29abeedb48b1f297f1a65a02998ff69;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 9dd904f1..e500ad75 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -3,15 +3,16 @@ namespace Wallabag\CoreBundle\Controller; use Pagerfanta\Adapter\DoctrineORMAdapter; -use Pagerfanta\Pagerfanta; +use Pagerfanta\Exception\OutOfRangeCurrentPageException; 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\Filter\EntryFilterType; +use Wallabag\CoreBundle\Form\Type\EntryFilterType; use Wallabag\CoreBundle\Form\Type\EditEntryType; use Wallabag\CoreBundle\Form\Type\NewEntryType; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; class EntryController extends Controller { @@ -22,10 +23,16 @@ class EntryController extends Controller { try { $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); + $em = $this->getDoctrine()->getManager(); $em->persist($entry); $em->flush(); } catch (\Exception $e) { + $this->get('logger')->error('Error while saving an entry', [ + 'exception' => $e, + 'entry' => $entry, + ]); + return false; } @@ -48,30 +55,30 @@ class EntryController extends Controller $form->handleRequest($request); if ($form->isValid()) { - // check for existing entry, if it exists, redirect to it with a message - $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); + $existingEntry = $this->checkIfEntryAlreadyExists($entry); if (false !== $existingEntry) { $this->get('session')->getFlashBag()->add( 'notice', - 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y') + $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', ['%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')]) ); - return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id']))); + return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()])); } - $this->updateEntry($entry); - $this->get('session')->getFlashBag()->add( - 'notice', - 'Entry saved' - ); + $message = 'flashes.entry.notice.entry_saved'; + if (false === $this->updateEntry($entry)) { + $message = 'flashes.entry.notice.entry_saved_failed'; + } + + $this->get('session')->getFlashBag()->add('notice', $message); return $this->redirect($this->generateUrl('homepage')); } - return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', [ 'form' => $form->createView(), - )); + ]); } /** @@ -81,23 +88,24 @@ class EntryController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function addEntryViaBookmarklet(Request $request) + public function addEntryViaBookmarkletAction(Request $request) { $entry = new Entry($this->getUser()); $entry->setUrl($request->get('url')); - $this->updateEntry($entry); + + if (false === $this->checkIfEntryAlreadyExists($entry)) { + $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) + public function addEntryAction() { return $this->render('WallabagCoreBundle:Entry:new.html.twig'); } @@ -127,15 +135,15 @@ class EntryController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Entry updated' + 'flashes.entry.notice.entry_updated' ); - return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); } - return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:edit.html.twig', [ 'form' => $form->createView(), - )); + ]); } /** @@ -249,18 +257,25 @@ class EntryController extends Controller } $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); - $entries = new Pagerfanta($pagerAdapter); - $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); - $entries->setCurrentPage($page); + $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries') + ->prepare($pagerAdapter, $page); + + try { + $entries->setCurrentPage($page); + } catch (OutOfRangeCurrentPageException $e) { + if ($page > 1) { + return $this->redirect($this->generateUrl($type, ['page' => $entries->getNbPages()]), 302); + } + } return $this->render( 'WallabagCoreBundle:Entry:entries.html.twig', - array( + [ 'form' => $form->createView(), 'entries' => $entries, 'currentPage' => $page, - ) + ] ); } @@ -279,7 +294,7 @@ class EntryController extends Controller return $this->render( 'WallabagCoreBundle:Entry:entry.html.twig', - array('entry' => $entry) + ['entry' => $entry] ); } @@ -297,9 +312,9 @@ class EntryController extends Controller { $this->checkUserAction($entry); - $message = 'Entry reloaded'; + $message = 'flashes.entry.notice.entry_reloaded'; if (false === $this->updateEntry($entry)) { - $message = 'Failed to reload entry'; + $message = 'flashes.entry.notice.entry_reload_failed'; } $this->get('session')->getFlashBag()->add( @@ -307,7 +322,7 @@ class EntryController extends Controller $message ); - return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); } /** @@ -327,16 +342,23 @@ class EntryController extends Controller $entry->toggleArchive(); $this->getDoctrine()->getManager()->flush(); + $message = 'flashes.entry.notice.entry_unarchived'; + if ($entry->isArchived()) { + $message = 'flashes.entry.notice.entry_archived'; + } + $this->get('session')->getFlashBag()->add( 'notice', - 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') + $message ); - return $this->redirect($request->headers->get('referer')); + $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer')); + + return $this->redirect($redirectUrl); } /** - * Changes favorite status for an entry. + * Changes starred status for an entry. * * @param Request $request * @param Entry $entry @@ -352,12 +374,19 @@ class EntryController extends Controller $entry->toggleStar(); $this->getDoctrine()->getManager()->flush(); + $message = 'flashes.entry.notice.entry_unstarred'; + if ($entry->isStarred()) { + $message = 'flashes.entry.notice.entry_starred'; + } + $this->get('session')->getFlashBag()->add( 'notice', - 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') + $message ); - return $this->redirect($request->headers->get('referer')); + $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer')); + + return $this->redirect($redirectUrl); } /** @@ -377,8 +406,8 @@ class EntryController extends Controller // to avoid redirecting to the deleted entry. Ugh. $url = $this->generateUrl( 'view', - array('id' => $entry->getId()), - UrlGeneratorInterface::ABSOLUTE_URL + ['id' => $entry->getId()], + UrlGeneratorInterface::ABSOLUTE_PATH ); $em = $this->getDoctrine()->getManager(); @@ -387,11 +416,16 @@ class EntryController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Entry deleted' + 'flashes.entry.notice.entry_deleted' ); - // don't redirect user to the deleted entry - return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage')); + // don't redirect user to the deleted entry (check that the referer doesn't end with the same url) + $referer = $request->headers->get('referer'); + $to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null); + + $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to); + + return $this->redirect($redirectUrl); } /** @@ -401,8 +435,94 @@ class EntryController extends Controller */ private function checkUserAction(Entry $entry) { - if ($this->getUser()->getId() != $entry->getUser()->getId()) { + if (null === $this->getUser() || $this->getUser()->getId() != $entry->getUser()->getId()) { throw $this->createAccessDeniedException('You can not access this entry.'); } } + + /** + * Check for existing entry, if it exists, redirect to it with a message. + * + * @param Entry $entry + * + * @return Entry|bool + */ + private function checkIfEntryAlreadyExists(Entry $entry) + { + return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); + } + + /** + * Get public URL for entry (and generate it if necessary). + * + * @param Entry $entry + * + * @Route("/share/{id}", requirements={"id" = "\d+"}, name="share") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function shareAction(Entry $entry) + { + $this->checkUserAction($entry); + + if ('' === $entry->getUuid() || null === $entry->getUuid()) { + $this->generateEntryUuid($entry); + } + + return $this->redirect($this->generateUrl('share_entry', [ + 'uuid' => $entry->getUuid(), + ])); + } + + /** + * Disable public sharing for an entry. + * + * @param Entry $entry + * + * @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function deleteShareAction(Entry $entry) + { + $this->checkUserAction($entry); + + $entry->cleanUuid(); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + + return $this->redirect($this->generateUrl('view', [ + 'id' => $entry->getId(), + ])); + } + + /** + * Share entry content. + * + * @param Entry $entry + * + * @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry") + * @Cache(maxage="25200", public=true) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function shareEntryAction(Entry $entry) + { + return $this->render( + '@WallabagCore/themes/share.html.twig', + array('entry' => $entry) + ); + } + + /** + * @param Entry $entry + */ + private function generateEntryUuid(Entry $entry) + { + $entry->generateUuid(); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + } }