diff options
| -rw-r--r-- | ajax/setallitemsread.php | 2 | ||||
| -rw-r--r-- | ajax/setitemstatus.php | 2 | ||||
| -rw-r--r-- | lib/feedmapper.php | 6 | ||||
| -rw-r--r-- | lib/foldermapper.php | 4 | ||||
| -rw-r--r-- | lib/itemmapper.php | 8 | ||||
| -rw-r--r-- | templates/part.feeds.php | 2 | ||||
| -rw-r--r-- | templates/part.items.php | 2 |
7 files changed, 16 insertions, 10 deletions
diff --git a/ajax/setallitemsread.php b/ajax/setallitemsread.php index ba084299d..1a3038550 100644 --- a/ajax/setallitemsread.php +++ b/ajax/setallitemsread.php @@ -41,7 +41,7 @@ switch ($feedId) { // necessary $success = false; if($mostRecentItemId !== 0) { - $mostRecentItem = $itemMapper->find($mostRecentItemId); + $mostRecentItem = $itemMapper->findById($mostRecentItemId); } foreach($items as $item) { // FIXME: this should compare the modified date diff --git a/ajax/setitemstatus.php b/ajax/setitemstatus.php index 2f99804e9..14ce8ad91 100644 --- a/ajax/setitemstatus.php +++ b/ajax/setitemstatus.php @@ -19,7 +19,7 @@ $itemId = $_POST['itemId']; $status = $_POST['status']; $itemMapper = new OCA\News\ItemMapper(); -$item = $itemMapper->find($itemId); +$item = $itemMapper->findById($itemId); switch ($status) { case 'read': diff --git a/lib/feedmapper.php b/lib/feedmapper.php index 85797c44c..16804a1a7 100644 --- a/lib/feedmapper.php +++ b/lib/feedmapper.php @@ -24,7 +24,9 @@ class FeedMapper { if ($userid !== null) { $this->userid = $userid; } - $this->userid = \OCP\USER::getUser(); + else { + $this->userid = \OCP\USER::getUser(); + } } /** @@ -113,7 +115,7 @@ class FeedMapper { $feed = self::fromRow($row); $itemMapper = new ItemMapper(); - $items = $itemMapper->findAll($id); + $items = $itemMapper->findById($id); $feed->setItems($items); return $feed; diff --git a/lib/foldermapper.php b/lib/foldermapper.php index 28abad0e6..17fcbbf7b 100644 --- a/lib/foldermapper.php +++ b/lib/foldermapper.php @@ -25,7 +25,9 @@ class FolderMapper { if ($userid !== null) { $this->userid = $userid; } - $this->userid = \OCP\USER::getUser(); + else { + $this->userid = \OCP\USER::getUser(); + } } diff --git a/lib/itemmapper.php b/lib/itemmapper.php index 1da04f8ef..41e4e3a29 100644 --- a/lib/itemmapper.php +++ b/lib/itemmapper.php @@ -25,7 +25,9 @@ class ItemMapper { if ($userid !== null) { $this->userid = $userid; } - $this->userid = \OCP\USER::getUser(); + else { + $this->userid = \OCP\USER::getUser(); + } } /** @@ -51,7 +53,7 @@ class ItemMapper { * @brief Retrieve all the item corresponding to a feed from the database * @param feedid The id of the feed in the database table. */ - public function findAll($feedid) { + public function findByFeedId($feedid) { $stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE feed_id = ? ORDER BY pub_date DESC'); $result = $stmt->execute(array($feedid)); @@ -233,7 +235,7 @@ class ItemMapper { * @brief Retrieve an item from the database * @param id The id of the feed in the database table. */ - public function find($id) { + public function findById($id) { $stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE id = ?'); $result = $stmt->execute(array($id)); $row = $result->fetchRow(); diff --git a/templates/part.feeds.php b/templates/part.feeds.php index edcc0de83..d85a07079 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -13,7 +13,7 @@ function print_collection_list($list) { elseif ($collection instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID'); $itemmapper = new OCA\News\ItemMapper(); - $items = $itemmapper->findAll($collection->getId()); + $items = $itemmapper->findByFeedId($collection->getId()); $counter = 0; foreach($items as $item) { if(!$item->isRead()) diff --git a/templates/part.items.php b/templates/part.items.php index b44a2688c..098718a6b 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -15,7 +15,7 @@ if ($feedId == -1 || $feedId == -2) { //TODO: change this values, too obscure } else { if($showAll) { - $items = $itemMapper->findAll($feedId); + $items = $itemMapper->findByFeedId($feedId); } else { $items = $itemMapper->findAllStatus($feedId, OCA\News\StatusFlag::UNREAD); } |