X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FPocketController.php;h=f952867bdb7a8b97b2ff57a0903d9e0a438fda01;hb=7f88c7423f0b0c8c565f7e4d4d1b37ba14e55dae;hp=71ceb4276d8378cbcaf64620871769a8fe7a02c9;hpb=0e8a0f77d0b643a884e6687bd9c463267852a970;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 71ceb427..f952867b 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -47,8 +47,12 @@ class PocketController extends Controller return $this->redirect($this->generateUrl('import_pocket')); } + $form = $request->request->get('form'); + $this->get('session')->set('import.pocket.code', $requestToken); - $this->get('session')->set('mark_as_read', $request->request->get('form')['mark_as_read']); + if (null !== $form && \array_key_exists('mark_as_read', $form)) { + $this->get('session')->set('mark_as_read', $form['mark_as_read']); + } return $this->redirect( 'https://getpocket.com/auth/authorize?request_token=' . $requestToken . '&redirect_uri=' . $this->generateUrl('import_pocket_callback', [], UrlGeneratorInterface::ABSOLUTE_URL), @@ -80,11 +84,11 @@ class PocketController extends Controller if (true === $pocket->setMarkAsRead($markAsRead)->import()) { $summary = $pocket->getSummary(); $message = $this->get('translator')->trans('flashes.import.notice.summary', [ - '%imported%' => $summary['imported'], - '%skipped%' => $summary['skipped'], + '%imported%' => null !== $summary && \array_key_exists('imported', $summary) ? $summary['imported'] : 0, + '%skipped%' => null !== $summary && \array_key_exists('skipped', $summary) ? $summary['skipped'] : 0, ]); - if (0 < $summary['queued']) { + if (null !== $summary && \array_key_exists('queued', $summary) && 0 < $summary['queued']) { $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [ '%queued%' => $summary['queued'], ]);