button to remove folder

2 files changed, 39 insertions, 8 deletions

diff --git a/ajax/deletefeed.php b/ajax/deletefeed.php
index b54620d48..a6f74f583 100644
--- a/ajax/deletefeed.php
+++ b/ajax/deletefeed.php
@@ -17,19 +17,17 @@ OCP\JSON::callCheck();
 
 $userid = OCP\USER::getUser();
 
-$feedurl = trim($_POST['feedurl']);
+$feedid = trim($_POST['feedid']);
 
-$feed = OC_News_Utils::fetch($feedurl);
 $feedmapper = new OC_News_FeedMapper();
-$feedid = $feedmapper->save($feed, 0);
+$success = $feedmapper->deleteById($feedid);
 
 $l = OC_L10N::get('news');
 
-if(!$feedid) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.'))));
-	OCP\Util::writeLog('news','ajax/newfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR);
+if(!$success) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing feed.'))));
+	OCP\Util::writeLog('news','ajax/deletefeed.php: Error removing feed: '.$_POST['feedid'], OCP\Util::ERROR);
 	exit();
 }
 
-//TODO: replace the following with a real success case. see contact/ajax/createaddressbook.php for inspirations
-OCP\JSON::success(array('data' => array('message' => $l->t('Feed added!'))));
+OCP\JSON::success(array('data' => array( 'feedid' => $feedid )));
diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php
new file mode 100644
index 000000000..f11a1975f
--- /dev/null
+++ b/ajax/deletefolder.php
@@ -0,0 +1,33 @@
+<?php
+/**
+* ownCloud - News app
+*
+* @author Alessandro Cosentino
+* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
+* 
+* This file is licensed under the Affero General Public License version 3 or later.
+* See the COPYING-README file
+* 
+*/
+
+// Check if we are a user
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('news');
+OCP\JSON::callCheck();
+
+$userid = OCP\USER::getUser();
+
+$folderid = trim($_POST['folderid']);
+
+$foldermapper = new OC_News_FolderMapper();
+$success = $foldermapper->deleteById($folderid);
+
+$l = OC_L10N::get('news');
+
+if(!$success) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing folder.'))));
+	OCP\Util::writeLog('news','ajax/deletefolder.php: Error removing folder: '.$_POST['folderid'], OCP\Util::ERROR);
+	exit();
+}
+
+OCP\JSON::success(array('data' => array( 'folderid' => $folderid )));