diff options
| -rwxr-xr-x | app/controllers/feedController.php | 6 | ||||
| -rw-r--r-- | app/models/Feed.php | 6 | ||||
| -rw-r--r-- | lib/lib_rss.php | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index e0c526655..6d25fe092 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -340,10 +340,10 @@ class feedController extends ActionController { Session::_param ('notification', $notif); Session::_param ('actualize_feeds', true); - // et on redirige vers la page import/export + // et on redirige vers la page d'accueil Request::forward (array ( - 'c' => 'configure', - 'a' => 'importExport' + 'c' => 'index', + 'a' => 'index' ), true); } diff --git a/app/models/Feed.php b/app/models/Feed.php index 14366c5b3..c1d0379a9 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -247,10 +247,8 @@ class Feed extends Model { $this->_url ($subscribe_url); } - if (empty($this->name)) { // May come from OPML - $title = $feed->get_title (); - $this->_name (!is_null ($title) ? $title : $this->url); - } + $title = $feed->get_title (); + $this->_name (!is_null ($title) ? $title : $this->url); $this->_website ($feed->get_link ()); $this->_description ($feed->get_description ()); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 3e23f7542..9bce0760b 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -91,7 +91,7 @@ function opml_export ($cats) { $txt .= '<outline text="' . $cat['name'] . '">' . "\n"; foreach ($cat['feeds'] as $feed) { - $txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" />' . "\n"; + $txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" description="' . $feed->description () . '" />' . "\n"; } $txt .= '</outline>' . "\n"; @@ -201,7 +201,10 @@ function getFeed ($outline, $cat_id) { $feed->_category ($cat_id); $feed->_name ($title); if (isset($outline['htmlUrl'])) { - $feed->_website((string)$outline['htmlUrl']); + $feed->_website(htmlspecialchars((string)$outline['htmlUrl'], ENT_QUOTES, 'UTF-8')); + } + if (isset($outline['description'])) { + $feed->_description(htmlspecialchars((string)$outline['description'], ENT_QUOTES, 'UTF-8')); } return $feed; } |