shows counter when adding feed; fixes bug when removing folder

4 files changed, 11 insertions, 13 deletions

diff --git a/ajax/createfeed.php b/ajax/createfeed.php
index c0ad68815..e66f6b125 100644
--- a/ajax/createfeed.php
+++ b/ajax/createfeed.php
@@ -35,9 +35,10 @@ $userid = OCP\USER::getUser();
 $feedurl = trim($_POST['feedurl']);
 $folderid = trim($_POST['folderid']);
 
-$feedmapper = new OCA\News\FeedMapper();
+$feedmapper = new OCA\News\FeedMapper($userid);
 $feedid = $feedmapper->findIdFromUrl($feedurl);
 
+
 $l = OC_L10N::get('news');
 
 if ($feedid === null) {
@@ -58,9 +59,12 @@ if($feed === null || !$feedid) {
 	exit();
 }
 
-// FIXME: assign counter
+$itemmapper = new OCA\News\ItemMapper($userid);
+$unreadItemsCount = $itemmapper->countAllStatus($feedid, OCA\News\StatusFlag::UNREAD);
+
 $tmpl_listfeed = new OCP\Template("news", "part.listfeed");
 $tmpl_listfeed->assign('feed', $feed);
+$tmpl_listfeed->assign('unreadItemsCount', $unreadItemsCount);
 $listfeed = $tmpl_listfeed->fetchPage();
 
 $tmpl_newfeed = new OCP\Template("news", "part.items.new");
diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php
index daf9a8397..20017c5c0 100644
--- a/ajax/deletefolder.php
+++ b/ajax/deletefolder.php
@@ -31,7 +31,7 @@ if(!$foldermapper->deleteById($folderid)) {
 
 // lets check if the currently shown feed is among the deleted feeds
 if ($shownfeedid != null) {
-	$feedmapper = new OC_News_FeedMapper();
+	$feedmapper = new OCA\News\FeedMapper();
 	if (!$feedmapper->findById($shownfeedid)) {
 		$tmpl = new OCP\Template("news", "part.items.deleted");
 		$part_items = $tmpl->fetchPage();
diff --git a/ajax/setallitemsread.php b/ajax/setallitemsread.php
index 4c1876b50..2d2ccead5 100644
--- a/ajax/setallitemsread.php
+++ b/ajax/setallitemsread.php
@@ -18,7 +18,7 @@ OCP\JSON::callCheck();
 $feedId = $_POST['feedId'];
 
 $itemMapper = new OCA\News\ItemMapper();
-$items = $itemMapper->findAllStatus($feedId, OCA\News\StatusFlag::Unread);
+$items = $itemMapper->findAllStatus($feedId, OCA\News\StatusFlag::UNREAD);
 
 // FIXME: maybe there is a way to set all items read in the
 // FeedMapper instead of iterating through every item and updating as 
diff --git a/ajax/updatefeed.php b/ajax/updatefeed.php
index f8dc2b13d..e29db31e3 100644
--- a/ajax/updatefeed.php
+++ b/ajax/updatefeed.php
@@ -38,15 +38,9 @@ if(!$newfeedid) {
 	exit();
 }
 else {
-	//TODO: maybe make this more efficient by coding it into OC_News_FeedMapper->save()
-	$itemmapper = new OCA\News\ItemMapper();
-	$items = $itemmapper->findAll($newfeedid);
-	$unreadcounter = 0;
-	foreach($items as $item) {
-		if(!$item->isRead())
-			++$unreadcounter;
-	}
-
+	$itemmapper = new OCA\News\ItemMapper($userid);
+	$unreadcounter = $itemmapper->countAllStatus($newfeedid, OCA\News\StatusFlag::UNREAD);
+	
 	OCP\JSON::success(array('data' => array('message' => $l->t('Feed updated!'), 'unreadcount' => $unreadcounter)));
 	exit();
 }