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 Wallabag\CoreBundle\Form\Type\EntryFilterType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Form\Type\NewEntryType;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\CoreBundle\Event\EntryDeletedEvent;
+use Wallabag\CoreBundle\Form\Type\SearchEntryType;
class EntryController extends Controller
{
/**
- * @param Entry $entry
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/search/{page}", name="search", defaults={"page" = 1})
+ *
+ * Default parameter for page is hardcoded (in duplication of the defaults from the Route)
+ * because this controller is also called inside the layout template without any page as argument
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function searchFormAction(Request $request, $page = 1, $currentRoute = null)
+ {
+ // fallback to retrieve currentRoute from query parameter instead of injected one (when using inside a template)
+ if (null === $currentRoute && $request->query->has('currentRoute')) {
+ $currentRoute = $request->query->get('currentRoute');
+ }
+
+ $form = $this->createForm(SearchEntryType::class);
+
+ $form->handleRequest($request);
+
+ if ($form->isSubmitted() && $form->isValid()) {
+ return $this->showEntries('search', $request, $page);
+ }
+
+ return $this->render('WallabagCoreBundle:Entry:search_form.html.twig', [
+ 'form' => $form->createView(),
+ 'currentRoute' => $currentRoute,
+ ]);
+ }
+
+ /**
+ * Fetch content and update entry.
+ * In case it fails, entry will return to avod loosing the data.
+ *
+ * @param Entry $entry
+ * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
+ *
+ * @return Entry
*/
- private function updateEntry(Entry $entry)
+ private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
{
+ // put default title in case of fetching content failed
+ $entry->setTitle('No title found');
+
+ $message = 'flashes.entry.notice.'.$prefixMessage;
+
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;
+ $message = 'flashes.entry.notice.'.$prefixMessage.'_failed';
}
- return true;
+ $this->get('session')->getFlashBag()->add('notice', $message);
+
+ return $entry;
}
/**
$form->handleRequest($request);
- if ($form->isValid()) {
+ if ($form->isSubmitted() && $form->isValid()) {
$existingEntry = $this->checkIfEntryAlreadyExists($entry);
if (false !== $existingEntry) {
return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
}
- $message = 'flashes.entry.notice.entry_saved';
- if (false === $this->updateEntry($entry)) {
- $message = 'flashes.entry.notice.entry_saved_failed';
- }
+ $this->updateEntry($entry);
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
- $this->get('session')->getFlashBag()->add('notice', $message);
+ // entry saved, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
return $this->redirect($this->generateUrl('homepage'));
}
if (false === $this->checkIfEntryAlreadyExists($entry)) {
$this->updateEntry($entry);
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+
+ // entry saved, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
}
return $this->redirect($this->generateUrl('homepage'));
$form->handleRequest($request);
- if ($form->isValid()) {
+ if ($form->isSubmitted() && $form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
private function showEntries($type, Request $request, $page)
{
$repository = $this->get('wallabag_core.entry_repository');
+ $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
+ $currentRoute = (!is_null($request->query->get('currentRoute')) ? $request->query->get('currentRoute') : '');
switch ($type) {
+ case 'search':
+ $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
+
+ break;
+ case 'untagged':
+ $qb = $repository->getBuilderForUntaggedByUser($this->getUser()->getId());
+
+ break;
case 'starred':
$qb = $repository->getBuilderForStarredByUser($this->getUser()->getId());
break;
$this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb);
}
- $pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
- $entries = new Pagerfanta($pagerAdapter);
+ $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
+
+ $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
+ ->prepare($pagerAdapter, $page);
- $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
try {
$entries->setCurrentPage($page);
} catch (OutOfRangeCurrentPageException $e) {
}
return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- [
+ 'WallabagCoreBundle:Entry:entries.html.twig', [
'form' => $form->createView(),
'entries' => $entries,
'currentPage' => $page,
+ 'searchTerm' => $searchTerm,
]
);
}
{
$this->checkUserAction($entry);
- $message = 'flashes.entry.notice.entry_reloaded';
- if (false === $this->updateEntry($entry)) {
- $message = 'flashes.entry.notice.entry_reload_failed';
+ $this->updateEntry($entry, 'entry_reloaded');
+
+ // if refreshing entry failed, don't save it
+ if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
+ $bag = $this->get('session')->getFlashBag();
+ $bag->clear();
+ $bag->add('notice', 'flashes.entry.notice.entry_reloaded_failed');
+
+ return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
}
- $this->get('session')->getFlashBag()->add(
- 'notice',
- $message
- );
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+
+ // entry saved, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
}
}
/**
- * Changes favorite status for an entry.
+ * Changes starred status for an entry.
*
* @param Request $request
* @param Entry $entry
$url = $this->generateUrl(
'view',
['id' => $entry->getId()],
- UrlGeneratorInterface::ABSOLUTE_URL
+ UrlGeneratorInterface::ABSOLUTE_PATH
);
+ // entry deleted, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
+
$em = $this->getDoctrine()->getManager();
$em->remove($entry);
$em->flush();
'flashes.entry.notice.entry_deleted'
);
- // don't redirect user to the deleted entry
- $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
+ // 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);
*/
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.');
}
}
{
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 (null === $entry->getUuid()) {
+ $entry->generateUuid();
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+ }
+
+ 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(),
+ ]));
+ }
+
+ /**
+ * Ability to view a content publicly.
+ *
+ * @param Entry $entry
+ *
+ * @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry")
+ * @Cache(maxage="25200", smaxage="25200", public=true)
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function shareEntryAction(Entry $entry)
+ {
+ if (!$this->get('craue_config')->get('share_public')) {
+ throw $this->createAccessDeniedException('Sharing an entry is disabled for this user.');
+ }
+
+ return $this->render(
+ '@WallabagCore/themes/common/Entry/share.html.twig',
+ ['entry' => $entry]
+ );
+ }
+
+ /**
+ * Shows untagged articles for current user.
+ *
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"})
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function showUntaggedEntriesAction(Request $request, $page)
+ {
+ return $this->showEntries('untagged', $request, $page);
+ }
}
projects / github / wallabag / wallabag.git / blobdiff