implemented server side move feed to folder

3 files changed, 11 insertions, 7 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');
 
diff --git a/js/items.js b/js/items.js
index 85b90f764..c105a8d54 100644
--- a/js/items.js
+++ b/js/items.js
@@ -90,7 +90,7 @@ var t = t || function(app, string){ return string; }; // mock translation for lo
 
         $.post(OC.filePath('news', 'ajax', 'loadfeed.php'), data, function(jsonData) {
             if(jsonData.status == 'success'){
-                self._$articleList.empty()
+                self._$articleList.empty() // FIXME: does this also removed cached items?
                 self._itemCache.populate(jsonData.data.feedItems);
 
                 var $items = self._itemCache.getFeedHtml(type, id);
diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index 82fff36ec..65194374e 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -201,13 +201,14 @@ class FeedMapper {
 		//update the db. it needs to be done, since it might be the first save after a full fetch
 			$stmt = \OCP\DB::prepare('
 					UPDATE ' . self::tableName .
-					' SET favicon_link = ? , lastmodified = ? 
+					' SET favicon_link = ? , lastmodified = ? , folder_id = ?
 					WHERE id = ?
 					');
 				
 			$params=array(
 				$favicon,
 				$_ut,
+				$folderid,
 				$feedid
 				);
 			$stmt->execute($params);