← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdepim/oneiric-security

« back to all changes in this revision

Viewing changes to messagecore/mailinglist.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2012-07-18 09:08:14 UTC
  • mfrom: (191.1.2 oneiric-proposed)
  • Revision ID: package-import@ubuntu.com-20120718090814-wixhd13e2hpl1h2m
Tags: 4:4.7.4+git111222-0ubuntu0.3
https://launchpad.net/bugs/1022690
* SECURITY UPDATE: Disable JavaScript, Java, and Plugins by default in
  kmail/kontact messageviewer's quote colorer (LP: #1022690)
  - Upstream Git dbb2f72f4745e00f53031965a9c10b2d6862bd54
  - CVE-2012-3413

Show diffs side-by-side

added added

removed removed

Lines of Context:
messagecore/mailinglist.cpp
491
491
  group.writeEntry( "MailingListFeatures", static_cast<int>( d->mFeatures ) );
492
492
  group.writeEntry( "MailingListHandler", static_cast<int>( d->mHandler ) );
493
493
  group.writeEntry( "MailingListId", d->mId );
494
 
  group.writeEntry( "MailingListPostingAddress", d->mPostUrls.toStringList() );
495
 
  group.writeEntry( "MailingListSubscribeAddress", d->mSubscribeUrls.toStringList() );
496
 
  group.writeEntry( "MailingListUnsubscribeAddress", d->mUnsubscribeUrls.toStringList() );
497
 
  group.writeEntry( "MailingListArchiveAddress", d->mArchiveUrls.toStringList() );
498
 
  group.writeEntry( "MailingListOwnerAddress", d->mOwnerUrls.toStringList() );
499
 
  group.writeEntry( "MailingListHelpAddress", d->mHelpUrls.toStringList() );
500
 
  /* Note: mArchivedAtUrl deliberately not saved here as it refers to a single 
 
494
  QStringList lst = d->mPostUrls.toStringList();
 
495
  if ( !lst.isEmpty() )
 
496
    group.writeEntry( "MailingListPostingAddress", lst );
 
497
  else
 
498
    group.deleteEntry( "MailingListPostingAddress" );
 
499
 
 
500
  lst = d->mSubscribeUrls.toStringList();
 
501
  if ( !lst.isEmpty() )
 
502
    group.writeEntry( "MailingListSubscribeAddress", lst );
 
503
  else
 
504
    group.deleteEntry( "MailingListSubscribeAddress" );
 
505
 
 
506
  lst = d->mUnsubscribeUrls.toStringList();
 
507
  if ( !lst.isEmpty() )
 
508
    group.writeEntry( "MailingListUnsubscribeAddress", lst );
 
509
  else
 
510
    group.deleteEntry( "MailingListUnsubscribeAddress" );
 
511
 
 
512
  lst = d->mArchiveUrls.toStringList();
 
513
  if ( !lst.isEmpty() )
 
514
    group.writeEntry( "MailingListArchiveAddress", lst );
 
515
  else
 
516
    group.deleteEntry( "MailingListArchiveAddress" );
 
517
 
 
518
  lst = d->mOwnerUrls.toStringList();
 
519
  if ( !lst.isEmpty() )
 
520
    group.writeEntry( "MailingListOwnerAddress", lst );
 
521
  else
 
522
    group.deleteEntry( "MailingListOwnerAddress" );
 
523
 
 
524
  lst = d->mHelpUrls.toStringList();
 
525
  if ( !lst.isEmpty() )
 
526
    group.writeEntry( "MailingListHelpAddress", lst );
 
527
  else
 
528
    group.deleteEntry( "MailingListHelpAddress" );
 
529
 
 
530
  /* Note: mArchivedAtUrl deliberately not saved here as it refers to a single
501
531
   * instance of a message rather than an element of a general mailing list.
502
532
   * http://reviewboard.kde.org/r/1768/#review2783
503
533
   */