2 files changed, 26 insertions, 10 deletions

diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 1751ae3..57a9ede 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -48,26 +48,26 @@ KIncidenceFormatter::KIncidenceFormatter()
 void KIncidenceFormatter::setEvent(Event *event)
 {
     int mode = 0;
     mCurrentIncidence = event;
     bool shortDate = true;
     if ( mode == 0 ) {
-        addTag("h3",event->summary());
+        addTag("h3",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>";
     } 
     if (event->cancelled ()) {
@@ -75,13 +75,13 @@ void KIncidenceFormatter::setEvent(Event *event)
         addTag("i",i18n("This event has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
     }
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
-        mText.append(event->location()+"<br>");
+        mText.append(deTag(event->location())+"<br>");
     }
     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))
                          .arg(event->dtEndDateStr(shortDate)));
@@ -141,13 +141,13 @@ void KIncidenceFormatter::setEvent(Event *event)
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     // mText.append(event->secrecyStr()+"<br>");
     formatCategories(event);
     if ( mDetails  ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",event->description());
+            addTag("p",deTag(event->description()));
         }
     }
 
     formatReadOnly(event);
     formatAttendees(event);
 
@@ -167,24 +167,24 @@ void KIncidenceFormatter::setEvent(Event *event)
 void KIncidenceFormatter::setTodo(Todo *event )
 {
     int mode = 0;
     mCurrentIncidence = event;
     bool shortDate = true;
     if (mode == 0 )
-        addTag("h3",event->summary());
+        addTag("h3",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>";
     } 
     if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
@@ -201,13 +201,13 @@ void KIncidenceFormatter::setTodo(Todo *event )
         mText.append("<br>");
         mText += "</font>";
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
-        mText.append(event->location()+"<br>");
+        mText.append(deTag(event->location())+"<br>");
     }
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
@@ -226,13 +226,13 @@ void KIncidenceFormatter::setTodo(Todo *event )
   
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);
     if ( mDetails  ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
-            addTag("p",event->description());
+            addTag("p",deTag(event->description()));
         }
     }
     formatReadOnly(event);
     formatAttendees(event);
     if ( mCreated ) {
         addTag("p",i18n("<b>Created: ")  +" </b>");
@@ -373,6 +373,21 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
 void KIncidenceFormatter::formatReadOnly(Incidence *event)
 {
  if (event->isReadOnly()) {
         addTag("p","<em>(" + i18n("read-only") + ")</em>");
     }
 }
+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
@@ -29,12 +29,13 @@ class KIncidenceFormatter : public QObject
 
     void formatCategories(Incidence *event);
     void formatAttendees(Incidence *event);
     void formatReadOnly(Incidence *event);
 
   private:
+    QString deTag(QString text);
     bool mSyncMode;
     bool mDetails, mCreated ,mModified;
 
     QString mText;
     Incidence* mCurrentIncidence; 
     static KIncidenceFormatter* mInstance;