From 5383f6206c6dfc7f2fe2376c12ce8879783e3506 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 23 Oct 2012 22:33:16 +0200 Subject: ajout fonction importation fichiers OPMs OPML --- app/controllers/configureController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/controllers/configureController.php') 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')); } } } -- cgit v1.2.3