Summary: | serendipity feed images not displayed | ||
---|---|---|---|
Product: | [Applications] akregator | Reporter: | kris |
Component: | general | Assignee: | kdepim bugs <kdepim-bugs> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
kris
2005-02-23 21:43:01 UTC
This is caused by the way the image urls are currently handled and not escaped before use. I just fixed this to my local copy, but can't commit yet since the cvs is frozen... CVS commit by rytilahti: Umm, use KURL for url handling instead of QString... Will backport soon. BUGS:100118 M +11 -4 articleviewer.cpp 1.94 M +1 -1 articleviewer.h 1.35 --- kdepim/akregator/src/articleviewer.cpp #1.93:1.94 @@ -59,5 +59,6 @@ ArticleViewer::ArticleViewer(QWidget *pa connect(kapp, SIGNAL(kdisplayPaletteChanged()), this, SLOT(slotPaletteOrFontChanged()) ); connect(kapp, SIGNAL(kdisplayFontChanged()), this, SLOT(slotPaletteOrFontChanged()) ); - m_imageDir="file:"+KGlobal::dirs()->saveLocation("cache", "akregator/Media/"); + + m_imageDir.setPath(KGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; } @@ -218,5 +219,8 @@ QString ArticleViewer::formatArticle(Fee { QString url=feed->xmlUrl(); - text += QString("<a href=\""+feed->htmlUrl()+"\"><img class=\"headimage\" src=\""+m_imageDir+url.replace("/", "_").replace(":", "_")+".png\"></a>\n"); + QString file = url.replace("/", "_").replace(":", "_"); + KURL u(m_imageDir); + u.setFileName(file); + text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } @@ -349,5 +353,8 @@ void ArticleViewer::showSummary(Feed *f) text += QString("<div class=\"body\">"); QString url=f->xmlUrl(); - text += QString("<a href=\""+f->htmlUrl()+"\"><img class=\"headimage\" src=\""+m_imageDir+url.replace("/", "_").replace(":", "_")+".png\"></a>\n"); + QString file = url.replace("/", "_").replace(":", "_"); + KURL u(m_imageDir); + u.setFileName(file); + text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(f->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; --- kdepim/akregator/src/articleviewer.h #1.34:1.35 @@ -103,5 +103,5 @@ namespace Akregator QString m_htmlFooter; QString m_currentText; - QString m_imageDir; + KURL m_imageDir; TreeNode* m_node; ArticleFilter m_textFilter; CVS commit by rytilahti: backport CCBUGS:100118 M +11 -4 articleviewer.cpp 1.93.4.1 M +1 -1 articleviewer.h 1.34.6.1 --- kdepim/akregator/src/articleviewer.cpp #1.93:1.93.4.1 @@ -59,5 +59,6 @@ ArticleViewer::ArticleViewer(QWidget *pa connect(kapp, SIGNAL(kdisplayPaletteChanged()), this, SLOT(slotPaletteOrFontChanged()) ); connect(kapp, SIGNAL(kdisplayFontChanged()), this, SLOT(slotPaletteOrFontChanged()) ); - m_imageDir="file:"+KGlobal::dirs()->saveLocation("cache", "akregator/Media/"); + + m_imageDir.setPath(KGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; } @@ -218,5 +219,8 @@ QString ArticleViewer::formatArticle(Fee { QString url=feed->xmlUrl(); - text += QString("<a href=\""+feed->htmlUrl()+"\"><img class=\"headimage\" src=\""+m_imageDir+url.replace("/", "_").replace(":", "_")+".png\"></a>\n"); + QString file = url.replace("/", "_").replace(":", "_"); + KURL u(m_imageDir); + u.setFileName(file); + text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } @@ -349,5 +353,8 @@ void ArticleViewer::showSummary(Feed *f) text += QString("<div class=\"body\">"); QString url=f->xmlUrl(); - text += QString("<a href=\""+f->htmlUrl()+"\"><img class=\"headimage\" src=\""+m_imageDir+url.replace("/", "_").replace(":", "_")+".png\"></a>\n"); + QString file = url.replace("/", "_").replace(":", "_"); + KURL u(m_imageDir); + u.setFileName(file); + text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(f->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; --- kdepim/akregator/src/articleviewer.h #1.34:1.34.6.1 @@ -103,5 +103,5 @@ namespace Akregator QString m_htmlFooter; QString m_currentText; - QString m_imageDir; + KURL m_imageDir; TreeNode* m_node; ArticleFilter m_textFilter; |