summaryrefslogtreecommitdiffstats
path: root/controller
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-09-11 20:31:58 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-09-12 01:00:32 +0200
commit00c6e040deec9c3998ab679dcb84fc46ae72d2ac (patch)
tree88a7ba6ab686b8a57d051f268e467773c8573059 /controller
parent8ca8695fbe55599b1212de332853ebb85442b226 (diff)
removed google importer on the serverside, add importer for articles
Diffstat (limited to 'controller')
-rw-r--r--controller/feedcontroller.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index 69b713914..762859627 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -227,18 +227,21 @@ class FeedController extends Controller {
* @IsSubAdminExemption
* @Ajax
*/
- public function importGoogleReader() {
+ public function importArticles() {
$json = $this->params('json');
$userId = $this->api->getUserId();
- $feed = $this->feedBusinessLayer->importGoogleReaderJSON($json, $userId);
+ $feed = $this->feedBusinessLayer->importArticles($json, $userId);
+
+ $params = array();
+ if($feed) {
+ $params['feeds'] = array($feed);
+ }
- $params = array(
- 'feeds' => array($feed)
- );
return $this->renderJSON($params);
}
+
/**
* @IsAdminExemption
* @IsSubAdminExemption