diff options
Diffstat (limited to 'src/Wallabag/UserBundle')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php index e4d55c19..449f1020 100644 --- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php +++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php | |||
@@ -17,18 +17,18 @@ class CreateConfigListener implements EventSubscriberInterface | |||
17 | private $em; | 17 | private $em; |
18 | private $theme; | 18 | private $theme; |
19 | private $itemsOnPage; | 19 | private $itemsOnPage; |
20 | private $rssLimit; | 20 | private $feedLimit; |
21 | private $language; | 21 | private $language; |
22 | private $readingSpeed; | 22 | private $readingSpeed; |
23 | private $actionMarkAsRead; | 23 | private $actionMarkAsRead; |
24 | private $listMode; | 24 | private $listMode; |
25 | 25 | ||
26 | public function __construct(EntityManager $em, $theme, $itemsOnPage, $rssLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode) | 26 | public function __construct(EntityManager $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode) |
27 | { | 27 | { |
28 | $this->em = $em; | 28 | $this->em = $em; |
29 | $this->theme = $theme; | 29 | $this->theme = $theme; |
30 | $this->itemsOnPage = $itemsOnPage; | 30 | $this->itemsOnPage = $itemsOnPage; |
31 | $this->rssLimit = $rssLimit; | 31 | $this->feedLimit = $feedLimit; |
32 | $this->language = $language; | 32 | $this->language = $language; |
33 | $this->readingSpeed = $readingSpeed; | 33 | $this->readingSpeed = $readingSpeed; |
34 | $this->actionMarkAsRead = $actionMarkAsRead; | 34 | $this->actionMarkAsRead = $actionMarkAsRead; |
@@ -51,7 +51,7 @@ class CreateConfigListener implements EventSubscriberInterface | |||
51 | $config = new Config($event->getUser()); | 51 | $config = new Config($event->getUser()); |
52 | $config->setTheme($this->theme); | 52 | $config->setTheme($this->theme); |
53 | $config->setItemsPerPage($this->itemsOnPage); | 53 | $config->setItemsPerPage($this->itemsOnPage); |
54 | $config->setRssLimit($this->rssLimit); | 54 | $config->setFeedLimit($this->feedLimit); |
55 | $config->setLanguage($this->language); | 55 | $config->setLanguage($this->language); |
56 | $config->setReadingSpeed($this->readingSpeed); | 56 | $config->setReadingSpeed($this->readingSpeed); |
57 | $config->setActionMarkAsRead($this->actionMarkAsRead); | 57 | $config->setActionMarkAsRead($this->actionMarkAsRead); |
diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php index b1d753d2..e2bc76c3 100644 --- a/src/Wallabag/UserBundle/Repository/UserRepository.php +++ b/src/Wallabag/UserBundle/Repository/UserRepository.php | |||
@@ -7,18 +7,18 @@ use Doctrine\ORM\EntityRepository; | |||
7 | class UserRepository extends EntityRepository | 7 | class UserRepository extends EntityRepository |
8 | { | 8 | { |
9 | /** | 9 | /** |
10 | * Find a user by its username and rss roken. | 10 | * Find a user by its username and Feed token. |
11 | * | 11 | * |
12 | * @param string $username | 12 | * @param string $username |
13 | * @param string $rssToken | 13 | * @param string $feedToken |
14 | * @return null|User | ||
14 | * | 15 | * |
15 | * @return User|null | ||
16 | */ | 16 | */ |
17 | public function findOneByUsernameAndRsstoken($username, $rssToken) | 17 | public function findOneByUsernameAndFeedtoken($username, $feedToken) |
18 | { | 18 | { |
19 | return $this->createQueryBuilder('u') | 19 | return $this->createQueryBuilder('u') |
20 | ->leftJoin('u.config', 'c') | 20 | ->leftJoin('u.config', 'c') |
21 | ->where('c.rssToken = :rss_token')->setParameter('rss_token', $rssToken) | 21 | ->where('c.feedToken = :feed_token')->setParameter('feed_token', $feedToken) |
22 | ->andWhere('u.username = :username')->setParameter('username', $username) | 22 | ->andWhere('u.username = :username')->setParameter('username', $username) |
23 | ->getQuery() | 23 | ->getQuery() |
24 | ->getOneOrNullResult(); | 24 | ->getOneOrNullResult(); |
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index d3925de3..06bd9e3f 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml | |||
@@ -28,7 +28,7 @@ services: | |||
28 | - "@doctrine.orm.entity_manager" | 28 | - "@doctrine.orm.entity_manager" |
29 | - "%wallabag_core.theme%" | 29 | - "%wallabag_core.theme%" |
30 | - "%wallabag_core.items_on_page%" | 30 | - "%wallabag_core.items_on_page%" |
31 | - "%wallabag_core.rss_limit%" | 31 | - "%wallabag_core.feed_limit%" |
32 | - "%wallabag_core.language%" | 32 | - "%wallabag_core.language%" |
33 | - "%wallabag_core.reading_speed%" | 33 | - "%wallabag_core.reading_speed%" |
34 | - "%wallabag_core.action_mark_as_read%" | 34 | - "%wallabag_core.action_mark_as_read%" |