summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewer.cpp42
-rw-r--r--korganizer/koeventviewer.h1
-rw-r--r--libkcal/kincidenceformatter.cpp35
-rw-r--r--libkcal/kincidenceformatter.h1
4 files changed, 55 insertions, 24 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 44da058..135ca73 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -245,5 +245,5 @@ void KOEventViewer::appendEvent(Event *event, int mode )
topLevelWidget()->setCaption(i18n("Event Viewer"));
if ( mode == 0 ) {
- addTag("h2",event->summary());
+ addTag("h2",deTag(event->summary()));
}
else {
@@ -256,7 +256,7 @@ void KOEventViewer::appendEvent(Event *event, int mode )
// mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
if ( mode == 1 ) {
- addTag("h2",i18n( "Local: " ) +event->summary());
+ addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
- addTag("h2",i18n( "Remote: " ) +event->summary());
+ addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
@@ -274,5 +274,5 @@ void KOEventViewer::appendEvent(Event *event, int mode )
if (!event->location().isEmpty()) {
addTag("b",i18n("Location: "));
- mText.append(event->location()+"<br>");
+ mText.append(deTag(event->location())+"<br>");
mMailSubject += i18n(" at ") + event->location();
}
@@ -345,5 +345,5 @@ void KOEventViewer::appendEvent(Event *event, int mode )
if (!event->description().isEmpty()) {
addTag("p",i18n("<b>Details: </b>"));
- addTag("p",event->description());
+ addTag("p",deTag(event->description()));
}
}
@@ -375,5 +375,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
bool shortDate = KOPrefs::instance()->mShortDateInViewer;
if (mode == 0 )
- addTag("h2",event->summary());
+ addTag("h2",deTag(event->summary()));
else {
if ( mColorMode == 1 ) {
@@ -384,7 +384,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
}
if ( mode == 1 ) {
- addTag("h2",i18n( "Local: " ) +event->summary());
+ addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
- addTag("h2",i18n( "Remote: " ) +event->summary());
+ addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
@@ -413,5 +413,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
if (!event->location().isEmpty()) {
addTag("b",i18n("Location: "));
- mText.append(event->location()+"<br>");
+ mText.append(deTag(event->location())+"<br>");
mMailSubject += i18n(" at ") + event->location();
}
@@ -435,5 +435,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
if (!event->description().isEmpty()) {
addTag("p",i18n("<b>Details: </b>"));
- addTag("p",event->description());
+ addTag("p",deTag(event->description()));
}
}
@@ -448,5 +448,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
if ( event->relatedTo() ) {
addTag("b",i18n("Parent todo:<br>"));
- mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
+ mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
}
QPtrList<Incidence> Relations = event->relations();
@@ -455,5 +455,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
addTag("b",i18n("Sub todos:<br>"));
for (to=Relations.first();to;to=Relations.next()) {
- mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
+ mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>");
}
@@ -624,5 +624,5 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
if (!jour->description().isEmpty()) {
- addTag("p",jour->description());
+ addTag("p",deTag(jour->description()));
}
setText(mText);
@@ -640,5 +640,4 @@ void KOEventViewer::setSyncMode( bool b )
}
-
void KOEventViewer::setTodo(Todo *event, bool clearV )
{
@@ -694,4 +693,19 @@ void KOEventViewer::addText(QString text)
setText(mText);
}
+QString KOEventViewer::deTag(QString text)
+{
+#if QT_VERSION >= 0x030000
+ text.replace( '<' , "&lt;" );
+ text.replace( '>' , "&gt;" );
+#else
+ if ( text.find ('<') > 0 ) {
+ text.replace( QRegExp("<") , "&lt;" );
+ }
+ if ( text.find ('>') > 0 ) {
+ text.replace( QRegExp(">") , "&gt;" );
+ }
+#endif
+ return text;
+}
void KOEventViewer::keyPressEvent ( QKeyEvent * e )
{
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 2d4a08e..47cc5e9 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -66,4 +66,5 @@ class KOEventViewer : public QTextBrowser {
QTextBrowser *mEventTextView;
bool mSyncMode;
+ QString deTag(QString text);
QString mText;
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 1751ae3..57a9ede 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -52,5 +52,5 @@ void KIncidenceFormatter::setEvent(Event *event)
bool shortDate = true;
if ( mode == 0 ) {
- addTag("h3",event->summary());
+ addTag("h3",deTag(event->summary()));
}
else {
@@ -63,7 +63,7 @@ void KIncidenceFormatter::setEvent(Event *event)
// mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
if ( mode == 1 ) {
- addTag("h2",i18n( "Local: " ) +event->summary());
+ addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
- addTag("h2",i18n( "Remote: " ) +event->summary());
+ addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
@@ -79,5 +79,5 @@ void KIncidenceFormatter::setEvent(Event *event)
if (!event->location().isEmpty()) {
addTag("b",i18n("Location: "));
- mText.append(event->location()+"<br>");
+ mText.append(deTag(event->location())+"<br>");
}
if (event->doesFloat()) {
@@ -145,5 +145,5 @@ void KIncidenceFormatter::setEvent(Event *event)
if (!event->description().isEmpty()) {
addTag("p",i18n("<b>Details: </b>"));
- addTag("p",event->description());
+ addTag("p",deTag(event->description()));
}
}
@@ -171,5 +171,5 @@ void KIncidenceFormatter::setTodo(Todo *event )
bool shortDate = true;
if (mode == 0 )
- addTag("h3",event->summary());
+ addTag("h3",deTag(event->summary()));
else {
if ( mColorMode == 1 ) {
@@ -180,7 +180,7 @@ void KIncidenceFormatter::setTodo(Todo *event )
}
if ( mode == 1 ) {
- addTag("h2",i18n( "Local: " ) +event->summary());
+ addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
- addTag("h2",i18n( "Remote: " ) +event->summary());
+ addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
@@ -205,5 +205,5 @@ void KIncidenceFormatter::setTodo(Todo *event )
if (!event->location().isEmpty()) {
addTag("b",i18n("Location: "));
- mText.append(event->location()+"<br>");
+ mText.append(deTag(event->location())+"<br>");
}
@@ -230,5 +230,5 @@ void KIncidenceFormatter::setTodo(Todo *event )
if (!event->description().isEmpty()) {
addTag("p",i18n("<b>Details: </b>"));
- addTag("p",event->description());
+ addTag("p",deTag(event->description()));
}
}
@@ -377,2 +377,17 @@ void KIncidenceFormatter::formatReadOnly(Incidence *event)
}
}
+QString KIncidenceFormatter::deTag(QString text)
+{
+#if QT_VERSION >= 0x030000
+ text.replace( '<' , "&lt;" );
+ text.replace( '>' , "&gt;" );
+#else
+ if ( text.find ('<') > 0 ) {
+ text.replace( QRegExp("<") , "&lt;" );
+ }
+ if ( text.find ('>') > 0 ) {
+ text.replace( QRegExp(">") , "&gt;" );
+ }
+#endif
+ return text;
+}
diff --git a/libkcal/kincidenceformatter.h b/libkcal/kincidenceformatter.h
index 068e6d2..b5603e0 100644
--- a/libkcal/kincidenceformatter.h
+++ b/libkcal/kincidenceformatter.h
@@ -33,4 +33,5 @@ class KIncidenceFormatter : public QObject
private:
+ QString deTag(QString text);
bool mSyncMode;
bool mDetails, mCreated ,mModified;