aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-19 22:11:58 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-19 22:11:58 +0100
commitdaefb8f095f1abe591347e99fcb09ab53701d39d (patch)
treeb74f00ab3bea55a2468446ceeb2a1d7433fd46d2
parent1c0e7a49528d1fb972a0fa0e9551d70dc5636442 (diff)
Caractères spéciaux feed->description
Feed->description est en HTML, il faut protéger les caractères spéciaux lors de certaines sorties.
-rw-r--r--app/views/configure/feed.phtml2
-rw-r--r--lib/lib_rss.php2
-rw-r--r--public/themes/default/freshrss.css2
-rw-r--r--public/themes/flat-design/freshrss.css2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 191e44b9b..4504b8d76 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -22,7 +22,7 @@
<div class="form-group">
<label class="group-name"><?php echo Minz_Translate::t ('feed_description'); ?></label>
<div class="group-controls">
- <textarea name="description" id="description"><?php echo $this->flux->description (); ?></textarea>
+ <textarea name="description" id="description"><?php echo htmlspecialchars($this->flux->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
</div>
</div>
<div class="form-group">
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 2fdfd4bd8..8b64eb7b9 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -116,7 +116,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 () . '" description="' . $feed->description () . '" />' . "\n";
+ $txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" description="' . htmlspecialchars($feed->description(), ENT_COMPAT, 'UTF-8') . '" />' . "\n";
}
$txt .= '</outline>' . "\n";
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index b53702c07..a63fc44bf 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -291,7 +291,7 @@
}
.flux:hover .item.title {
overflow: visible;
- padding-right: 1.5em;
+ padding-right: 2em;
position: absolute;
}
.flux .item.title a {
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index bbe477c04..839626227 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -273,7 +273,7 @@ body {
}
.flux:hover .item.title {
overflow: visible;
- padding-right: 1.5em;
+ padding-right: 2em;
position: absolute;
}
.flux .item.title a {