avoid adding feeds that already exist

1 files changed, 15 insertions, 6 deletions

diff --git a/ajax/createfeed.php b/ajax/createfeed.php
index a17ef8f33..364679189 100644
--- a/ajax/createfeed.php
+++ b/ajax/createfeed.php
@@ -20,15 +20,24 @@ $userid = OCP\USER::getUser();
 $feedurl = trim($_POST['feedurl']);
 $folderid = trim($_POST['folderid']);
 
-$feed = OC_News_Utils::fetch($feedurl);
-
-if ($feed != null) {
-      $feedmapper = new OC_News_FeedMapper();
-      $feedid = $feedmapper->save($feed, $folderid);
-}
+$feedmapper = new OC_News_FeedMapper();
+$feedid = $feedmapper->findIdFromUrl($feedurl);
 
 $l = OC_L10N::get('news');
 
+if ($feedid == null) {
+	$feed = OC_News_Utils::fetch($feedurl);
+
+	if ($feed != null) {
+	      $feedid = $feedmapper->save($feed, $folderid);
+	}
+}
+else {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Feed already exists.'))));
+	OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR);
+	exit();
+}
+
 if($feed == null || !$feedid) {
 	OCP\JSON::error(array('data' => array('message' => $l->t('Error adding feed.'))));
 	OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR);