diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 15:26:41 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 15:26:41 +0100 |
| commit | 876369d65503830e5600593ddcdfb828973898b4 (patch) | |
| tree | 879f837eff24a2b67dd5ee1fc1c8325d446dc61a | |
| parent | fd171e8f9517dd5a046d4f7f159cde3002e7706a (diff) | |
Correction bug export RSS (encodage de &) + petits ajouts navigation dans la configuration
| -rw-r--r-- | app/views/configure/categorize.phtml | 2 | ||||
| -rw-r--r-- | app/views/configure/feed.phtml | 12 | ||||
| -rw-r--r-- | lib/lib_rss.php | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index aa87129aa..502bd86e5 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -2,7 +2,7 @@ <div class="post"> <form method="post" action="<?php echo _url ('configure', 'categorize'); ?>"> - <legend>Gestion des catégories</legend> + <legend>Gestion des catégories - <a href="<?php echo _url ('configure', 'feed'); ?>">gestion des flux</a></legend> <?php $i = 0; foreach ($this->categories as $cat) { $i++; ?> <div class="form-group"> diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index 145d79348..8b8b8ed7c 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -14,6 +14,13 @@ <span class="control"><a target="_blank" href="<?php echo $this->flux->website (); ?>"><?php echo $this->flux->website (); ?></a></span> </div> </div> + + <div class="form-group"> + <label class="group-name">URL du flux</label> + <div class="group-controls"> + <span class="control"><a target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo $this->flux->url (); ?></a></span> + </div> + </div> <div class="form-group"> <label class="group-name">Nombre d'articles</label> @@ -22,8 +29,7 @@ </div> </div> - <?php if (!empty ($this->categories)) { ?> - <legend>Catégorie</legend> + <legend>Catégorie - <a href="<?php echo _url ('configure', 'categorize'); ?>">gestion</a></legend> <div class="form-group"> <label class="group-name">Ranger dans une catégorie</label> <div class="group-controls"> @@ -35,8 +41,6 @@ <?php } ?> </div> </div> - - <?php } ?> <legend>Avancé</legend> <div class="form-group"> diff --git a/lib/lib_rss.php b/lib/lib_rss.php index a412ca7b1..b9202755b 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -89,7 +89,7 @@ function opml_export ($cats) { $txt .= '<outline text="' . $cat['name'] . '">' . "\n"; foreach ($cat['feeds'] as $feed) { - $txt .= "\t" . '<outline text="' . cleanText ($feed->name ()) . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" />' . "\n"; + $txt .= "\t" . '<outline text="' . cleanText ($feed->name ()) . '" type="rss" xmlUrl="' . htmlentities ($feed->url ()) . '" htmlUrl="' . htmlentities ($feed->website ()) . '" />' . "\n"; } $txt .= '</outline>' . "\n"; |