aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/configureController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2012-10-23 22:33:16 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2012-10-23 22:33:16 +0200
commit5383f6206c6dfc7f2fe2376c12ce8879783e3506 (patch)
tree5722d302bd43a0c74567e87aaf380f8ac11396e2 /app/controllers/configureController.php
parentfca236dc6d6ff6e09182c560f3566904cbc7a70a (diff)
ajout fonction importation fichiers OPMs OPML
Diffstat (limited to 'app/controllers/configureController.php')
-rwxr-xr-xapp/controllers/configureController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index e61eb3872..00bc571da 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -110,12 +110,12 @@ class configureController extends ActionController {
$this->view->categories = $list;
} elseif ($this->view->req == 'import' && Request::isPost ()) {
if ($_FILES['file']['error'] == 0) {
- $content = file_get_contents ($_FILES['file']['tmp_name']);
- $feeds = opml_import ($content);
+ list ($categories, $feeds) = opml_import (file_get_contents ($_FILES['file']['tmp_name']));
- Request::_param ('q');
+ Request::_param ('q', 'null');
+ Request::_param ('categories', $categories);
Request::_param ('feeds', $feeds);
- Request::forward (array ('c' => 'feed', 'a' => 'massiveInsert'));
+ Request::forward (array ('c' => 'feed', 'a' => 'massiveImport'));
}
}
}