use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\Repository;
-use Wallabag\CoreBundle\Entity\Entries;
+use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Service\Extractor;
-use Wallabag\CoreBundle\Helper\Url;
+use Wallabag\CoreBundle\Form\Type\NewEntryType;
+use Wallabag\CoreBundle\Form\Type\EditEntryType;
+use Wallabag\CoreBundle\Filter\EntryFilterType;
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Pagerfanta;
class EntryController extends Controller
{
/**
- * @param Request $request
- * @Route("/new", name="new_entry")
+ * @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 Entries();
- $entry->setUserId(1);
+ $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);
return $this->redirect($this->generateUrl('homepage'));
}
- return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
+ return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array(
'form' => $form->createView(),
));
}
/**
- * Shows unread entries for current user
+ * @param Request $request
+ *
+ * @Route("/new", name="new")
*
- * @Route("/unread", name="unread")
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function showUnreadAction()
+ public function addEntryAction(Request $request)
{
- $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
- // TODO don't give the user ID like this
- // TODO change pagination
- $entries = $repository->findUnreadByUser(1, 0);
+ 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(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.
+ *
+ * @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)
+ {
+ $form = $this->get('form.factory')->create(new EntryFilterType());
+
+ $filterBuilder = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findUnreadByUser($this->getUser()->getId());
+
+ 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, $filterBuilder);
+ }
+
+ $pagerAdapter = new DoctrineORMAdapter($filterBuilder->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 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:Entries');
- // TODO don't give the user ID like this
- // TODO change pagination
- $entries = $repository->findArchiveByUser(1, 0);
+ $form = $this->get('form.factory')->create(new EntryFilterType());
+
+ $filterBuilder = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findArchiveByUser($this->getUser()->getId());
+
+ 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, $filterBuilder);
+ }
+
+ $pagerAdapter = new DoctrineORMAdapter($filterBuilder->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 starred entries for current user
+ * Shows starred entries for current user.
+ *
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
*
- * @Route("/starred", name="starred")
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function showStarredAction()
+ public function showStarredAction(Request $request, $page)
{
- $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
- // TODO don't give the user ID like this
- // TODO change pagination
- $entries = $repository->findStarredByUser(1, 0);
+ $form = $this->get('form.factory')->create(new EntryFilterType());
+
+ $filterBuilder = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findStarredByUser($this->getUser()->getId());
+
+ 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, $filterBuilder);
+ }
+
+ $pagerAdapter = new DoctrineORMAdapter($filterBuilder->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 Entries $entry
* @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
+ *
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function viewAction(Entries $entry)
+ public function viewAction(Entry $entry)
{
+ $this->checkUserAction($entry);
+
return $this->render(
'WallabagCoreBundle:Entry:entry.html.twig',
array('entry' => $entry)
}
/**
- * Changes read status for an entry
+ * Changes read status for an entry.
+ *
+ * @param Request $request
+ * @param Entry $entry
*
- * @param Request $request
- * @param Entries $entry
* @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
+ *
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- public function toggleArchiveAction(Request $request, Entries $entry)
+ public function toggleArchiveAction(Request $request, Entry $entry)
{
+ $this->checkUserAction($entry);
+
$entry->toggleArchive();
$this->getDoctrine()->getManager()->flush();
}
/**
- * Changes favorite status for an entry
+ * Changes favorite status for an entry.
+ *
+ * @param Request $request
+ * @param Entry $entry
*
- * @param Request $request
- * @param Entries $entry
* @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
+ *
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- public function toggleStarAction(Request $request, Entries $entry)
+ public function toggleStarAction(Request $request, Entry $entry)
{
+ $this->checkUserAction($entry);
+
$entry->toggleStar();
$this->getDoctrine()->getManager()->flush();
}
/**
- * Deletes entry
+ * Deletes entry.
+ *
+ * @param Request $request
+ * @param Entry $entry
*
- * @param Request $request
- * @param Entries $entry
* @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
+ *
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- public function deleteEntryAction(Request $request, Entries $entry)
+ public function deleteEntryAction(Request $request, Entry $entry)
{
+ $this->checkUserAction($entry);
+
$em = $this->getDoctrine()->getManager();
$em->remove($entry);
$em->flush();
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.');
+ }
+ }
}
projects / github / wallabag / wallabag.git / blobdiff