Merge pull request #1583 from wallabag/v2-fix-delete

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Controller / PocketController.php

diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index 61eeba43f9009d47bbe40709630907b9846aaaa4..7aee302f53f2e00fd341147467376b6e215bf775 100644 (file)
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -3,36 +3,39 @@
 namespace Wallabag\ImportBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
 class PocketController extends Controller
 {
     /**
-     * @Route("/import/pocket", name="import_pocket")
+     * @Route("/pocket", name="import_pocket")
      */
     public function indexAction()
     {
-        return $this->render('WallabagImportBundle:Pocket:index.html.twig', []);
+        return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
+            'import' => $this->get('wallabag_import.pocket.import'),
+        ]);
     }
 
     /**
-     * @Route("/import/pocket/auth", name="import_pocket_auth")
+     * @Route("/pocket/auth", name="import_pocket_auth")
      */
     public function authAction()
     {
         $requestToken = $this->get('wallabag_import.pocket.import')
-            ->getRequestToken($this->generateUrl('import', [], true));
+            ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
 
         $this->get('session')->set('import.pocket.code', $requestToken);
 
         return $this->redirect(
-            'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', [], true),
+            'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
             301
         );
     }
 
     /**
-     * @Route("/import/pocket/callback", name="import_pocket_callback")
+     * @Route("/pocket/callback", name="import_pocket_callback")
      */
     public function callbackAction()
     {
@@ -51,7 +54,7 @@ class PocketController extends Controller
 
         if (true === $pocket->import()) {
             $summary = $pocket->getSummary();
-            $message = $summary['imported'].' entrie(s) imported, '.$summary['skipped'].' already saved.';
+            $message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.';
         }
 
         $this->get('session')->getFlashBag()->add(