diff options
Diffstat (limited to 'ajax')
-rw-r--r-- | ajax/feedlist.php | 8 | ||||
-rw-r--r-- | ajax/updatefeed.php | 18 |
2 files changed, 14 insertions, 12 deletions
diff --git a/ajax/feedlist.php b/ajax/feedlist.php index e5a37ef2b..92d1e0f20 100644 --- a/ajax/feedlist.php +++ b/ajax/feedlist.php @@ -18,15 +18,15 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); $feedmapper = new OC_News_FeedMapper(); +$feeds = $feedmapper->findAll($userid); $l = OC_L10N::get('news'); -if(!$feedid) { +if($feeds == null) { OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.')))); - OCP\Util::writeLog('news','ajax/feedlist.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR); + OCP\Util::writeLog('news','ajax/feedlist.php: Error updating feeds: '.$_POST['feedurl'], 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' => $feeds)); diff --git a/ajax/updatefeed.php b/ajax/updatefeed.php index 754d87495..bc74324e3 100644 --- a/ajax/updatefeed.php +++ b/ajax/updatefeed.php @@ -17,21 +17,23 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); -$feedurl = trim($_POST['feedurl']); -$folderid = trim($_POST['folderid']); +$feedid = $_POST['feedid']; +$feedurl = $_POST['feedurl']; +$folderid = $_POST['folderid']; + +$newfeed = OC_News_Utils::fetch($feedurl); -$feed = OC_News_Utils::fetch($feedurl); $feedmapper = new OC_News_FeedMapper(); -$feedid = $feedmapper->save($feed, $folderid); +$newfeedid = $feedmapper->save($newfeed, $folderid); $l = OC_L10N::get('news'); -if(!$feedid) { - OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.')))); - OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR); +if(!$newfeedid) { + OCP\JSON::error(array('data' => array('message' => $l->t('Error updating feed.')))); + OCP\Util::writeLog('news','ajax/updatefeed.php: Error updating 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('message' => $l->t('Feed updated!')))); |