1 files changed, 8 insertions, 5 deletions
diff --git a/ajax/movefeedtofolder.php b/ajax/movefeedtofolder.php
index 44dd1f022..16439ce3c 100644
--- a/ajax/movefeedtofolder.php
+++ b/ajax/movefeedtofolder.php
@@ -15,17 +15,20 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('news');
 OCP\JSON::callCheck();
 
-$folderId = $_POST['folderId'];
+$folderId = (int)$_POST['folderId'];
 $feedId = $_POST['feedId'];
 
 
 $feedMapper = new OCA\News\FeedMapper();
 $feed = $feedMapper->findById($feedId);
 
-// FIXME: check if we're allowed to perform this action
-//$feed->setFolder($folderId);
-//$success = $feedMapper->update($feed);
-$success = true;
+if($folderId === 0){
+    $success = $feedMapper->save($feed, $folderId);
+} else {
+    $folderMapper = new OCA\News\FolderMapper();
+    $folder = $folderMapper->find($folderId);
+    $success = $feedMapper->save($feed, $folder->getId());
+}
 
 $l = OC_L10N::get('news');