[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2007-12-11 11:21:57
Message-ID: 1197372117.084553.3303.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 747218 by vkrause:

Merged revisions 747182 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r747182 | vkrause | 2007-12-11 10:21:10 +0100 (Tue, 11 Dec 2007) | 4 lines
  
  Escape all fields that could contain HTML tags.
  
  Kolab issue 2146
........


 _M            . (directory)  
 M  +10 -9     libkdepim/addresseeview.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,7293 \
06,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689 \
/trunk/KDE/kdepim:1-738080  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,72 \
9611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689,747182 \
                /trunk/KDE/kdepim:1-738080
--- branches/work/kdab-post-4.0/kdepim/libkdepim/addresseeview.cpp #747217:747218
@@ -219,7 +219,7 @@
     KABC::PhoneNumber::List phones = addr.phoneNumbers();
     KABC::PhoneNumber::List::ConstIterator phoneIt;
     for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
-      QString number = (*phoneIt).number();
+      QString number = Qt::escape( (*phoneIt).number() );
 
       QString url;
       if ( (*phoneIt).type() & KABC::PhoneNumber::Fax )
@@ -253,7 +253,7 @@
       if ( linkMask & EmailLinks ) {
         dynamicPart += rowFmtStr.arg( type )
           .arg( QString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" )
-          .arg( fullEmail, *emailIt ) );
+          .arg( fullEmail, Qt::escape( *emailIt ) ) );
       } else {
         dynamicPart += rowFmtStr.arg( type ).arg( *emailIt );
       }
@@ -289,7 +289,7 @@
       if ( (*addrIt).label().isEmpty() ) {
         QString formattedAddress;
 
-        formattedAddress = (*addrIt).formattedAddress().trimmed();
+        formattedAddress = Qt::escape( (*addrIt).formattedAddress().trimmed() );
 
         formattedAddress = formattedAddress.replace( '\n', "<br>" );
 
@@ -327,7 +327,8 @@
     // @STYLE@ - substitute the cell style in first, and append
     // the data afterwards (keeps us safe from possible % signs
     // in either one).
-    notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( addr.note().replace( '\n', "<br>" \
) ) ; +    notes = Qt::escape( addr.note() );
+    notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ;
   }
 
   QString customData;
@@ -366,15 +367,15 @@
           if ( keyIt != titleMap.end() )
             key = keyIt.value();
 
-          customData += rowFmtStr.arg( key ).arg( value ) ;
+          customData += rowFmtStr.arg( key ).arg( Qt::escape( value ) ) ;
         }
       }
     }
   }
 
-  QString name( addr.realName() );
-  QString role( addr.role() );
-  QString organization( addr.organization() );
+  QString name( Qt::escape( addr.realName() ) );
+  QString role( Qt::escape( addr.role() ) );
+  QString organization( Qt::escape( addr.organization() ) );
 /*
   if ( proxy && (fieldMask & IMFields) ) {
     if ( proxy->isPresent( addr.uid() ) && proxy->presenceNumeric( addr.uid() ) > 0 \
) { @@ -448,7 +449,7 @@
   strAddr.append( notes );
   strAddr.append( customData );
   strAddr.append( QString::fromLatin1( "</table></div>\n" ) );
-  
+
   if ( addr.resource() )
       strAddr.append( i18n( "<p><b>Address book</b>: %1</p>", \
addr.resource()->resourceName() ) );  return strAddr;


[prev in list] [next in list] [prev in thread] [next in thread]