2 files changed, 29 insertions, 14 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 44da058..135ca73 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -241,26 +241,26 @@ void KOEventViewer::appendEvent(Event *event, int mode )
 {  
     mMailSubject = "";
     mCurrentIncidence = event;
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     topLevelWidget()->setCaption(i18n("Event Viewer"));
     if ( mode == 0 ) {
-        addTag("h2",event->summary());
+        addTag("h2",deTag(event->summary()));
     }
     else {
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#C00000\">";
         }
         // 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 ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Meeting " )+ event->summary();
@@ -270,13 +270,13 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
-        mText.append(event->location()+"<br>");
+        mText.append(deTag(event->location())+"<br>");
         mMailSubject += i18n(" at ") + event->location();
     }
     if (event->doesFloat()) {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
                          .arg(event->dtStartDateStr(shortDate))
@@ -341,13 +341,13 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     mText.append(event->secrecyStr()+"<br>");
   
 
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",event->description());
+            addTag("p",deTag(event->description()));
         }
     }
     formatCategories(event);
 
     formatReadOnly(event);
     formatAttendees(event);
@@ -371,24 +371,24 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
 {
     mMailSubject = "";
     mCurrentIncidence = event;
     topLevelWidget()->setCaption(i18n("Todo Viewer"));
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     if (mode == 0 )
-        addTag("h2",event->summary());
+        addTag("h2",deTag(event->summary()));
     else { 
         if ( mColorMode == 1 ) {
             mText +="<font color=\"#00A000\">";
         }
         if ( mColorMode == 2 ) {
             mText +="<font color=\"#B00000\">";
         }
         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 ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
@@ -409,13 +409,13 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
-        mText.append(event->location()+"<br>");
+        mText.append(deTag(event->location())+"<br>");
         mMailSubject += i18n(" at ") + event->location();
     }
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
@@ -431,33 +431,33 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");
     if ( KOPrefs::instance()->mEVshowDetails ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",event->description());
+            addTag("p",deTag(event->description()));
         }
     }
 
     formatCategories(event);
 
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     formatReadOnly(event);
     formatAttendees(event);
     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();
     Incidence *to;
     if ( Relations.first() )
         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>");
         
     }  
     if ( KOPrefs::instance()->mEVshowCreated ) {
         addTag("p",i18n("<b>Created: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         
@@ -620,13 +620,13 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
         } 
     }
     topLevelWidget()->setCaption("Journal Viewer");
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer)));
     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);
 }
 
 void KOEventViewer::formatReadOnly(Incidence *event)
 {
@@ -636,13 +636,12 @@ void KOEventViewer::formatReadOnly(Incidence *event)
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
 
-
 void KOEventViewer::setTodo(Todo *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
@@ -690,12 +689,27 @@ void KOEventViewer::clearEvents(bool now)
 
 void KOEventViewer::addText(QString text)
 {
     mText.append(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 )
 { 
     switch ( e->key() ) {
     case Qt::Key_Return:
     case Qt::Key_Enter :
         e->ignore();
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 2d4a08e..47cc5e9 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -62,12 +62,13 @@ class KOEventViewer : public QTextBrowser {
     void formatReadOnly(Incidence *event);
     void keyPressEvent ( QKeyEvent * e );
 
   private:
     QTextBrowser *mEventTextView;
     bool mSyncMode;
+    QString deTag(QString text);
 
     QString mText;
     QString mMailSubject;
     Incidence* mCurrentIncidence;  
   signals:
     void launchaddressbook(QString uid);