namespace Wallabag\CoreBundle\Controller;
use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Exception\OutOfRangeCurrentPageException;
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\Filter\EntryFilterType;
+use Wallabag\CoreBundle\Form\Type\EntryFilterType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Form\Type\NewEntryType;
$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', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')))
);
- return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
+ return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
}
$this->updateEntry($entry);
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry saved'
+ 'flashes.entry.notice.entry_saved'
);
return $this->redirect($this->generateUrl('homepage'));
*
* @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');
}
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry updated'
+ 'flashes.entry.notice.entry_updated'
);
return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
$entries = new Pagerfanta($pagerAdapter);
$entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
- $entries->setCurrentPage($page);
+ try {
+ $entries->setCurrentPage($page);
+ } catch (OutOfRangeCurrentPageException $e) {
+ if ($page > 1) {
+ return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302);
+ }
+ }
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
{
$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(
$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'));
$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'));
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry deleted'
+ 'flashes.entry.notice.entry_deleted'
);
// don't redirect user to the deleted entry
throw $this->createAccessDeniedException('You can not access this entry.');
}
}
+
+ /**
+ * Check for existing entry, if it exists, redirect to it with a message.
+ *
+ * @param $entry
+ *
+ * @return array|bool
+ */
+ private function checkIfEntryAlreadyExists($entry)
+ {
+ return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+ }
}