TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Added new hidden vCard URI parameter for certain CardDAV systems (such as Zimbra) that do not handle UID properly

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1141499 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 15 years ago
parent d855ad0ae0
commit f5dfb1faa6
7 changed files with 147 additions and 84 deletions
Show Stats Download Patch File Download Diff File

19
kabc/scripts/addressee.src.cpp
Unescape View File

@ -47,6 +47,7 @@ KABC::SortMode *Addressee::mSortMode = 0;
struct Addressee::AddresseeData : public KShared struct Addressee::AddresseeData : public KShared
{ {
QString uid; QString uid;
QString uri;
--VARIABLES-- --VARIABLES--
PhoneNumber::List phoneNumbers; PhoneNumber::List phoneNumbers;
@ -180,6 +181,24 @@ QString Addressee::uidLabel()
return i18n("Unique Identifier"); return i18n("Unique Identifier");
} }
void Addressee::setUri( const QString &id )
{
if ( id == mData->uri ) return;
detach();
mData->empty = false;
mData->uri = id;
}
QString Addressee::uri() const
{
return mData->uri;
}
QString Addressee::uriLabel()
{
return i18n("Unique Resource Identifier");
}
--DEFINITIONS-- --DEFINITIONS--
void Addressee::setNameFromString( const QString &s ) void Addressee::setNameFromString( const QString &s )

13
kabc/scripts/addressee.src.h
Unescape View File

@ -110,6 +110,19 @@ class KABC_EXPORT Addressee
*/ */
static QString uidLabel(); static QString uidLabel();
/**
Set unique resource identifier.
*/
void setUri( const QString &uid );
/**
Return unique resource identifier.
*/
QString uri() const;
/**
Return translated label for uri field.
*/
static QString uriLabel();
--DECLARATIONS-- --DECLARATIONS--
/** /**
Set name fields by parsing the given string and trying to associate the Set name fields by parsing the given string and trying to associate the

96
kabc/vcard/Enum.cpp
Unescape View File

@ -2,7 +2,7 @@
libvcard - vCard parsing library for vCard version 3.0 libvcard - vCard parsing library for vCard version 3.0
Copyright (C) 1998 Rik Hemsley rik@kde.org Copyright (C) 1998 Rik Hemsley rik@kde.org
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the deal in the Software without restriction, including without limitation the
@ -29,6 +29,8 @@
using namespace VCARD; using namespace VCARD;
// There are 31 possible types, not including extensions. // There are 31 possible types, not including extensions.
// URI is a custom field designed to store the upstream URI for each contact
// in order to handle certain limited CardDAV systems such as Zimbra
const QCString const QCString
VCARD::paramNames [] = VCARD::paramNames [] =
{ {
@ -62,7 +64,8 @@ VCARD::paramNames [] =
"URL", "URL",
"VERSION", "VERSION",
"CLASS", "CLASS",
"KEY" "KEY",
"URI"
}; };
const ParamType const ParamType
@ -99,6 +102,7 @@ VCARD::paramTypesTable[] = {
ParamNone, // CLASS ParamNone, // CLASS
ParamTextBin, // KEY ParamTextBin, // KEY
ParamTextNS // X ParamTextNS // X
ParamNone, // URI
}; };
ParamType ParamType
@ -107,31 +111,31 @@ VCARD::EntityTypeToParamType(EntityType e)
ParamType t(ParamUnknown); ParamType t(ParamUnknown);
switch (e) { switch (e) {
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityAgent: t = ParamAgent; break; case EntityAgent: t = ParamAgent; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntitySound: t = ParamSound; break; case EntitySound: t = ParamSound; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntitySource: t = ParamSource; break; case EntitySource: t = ParamSource; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityTelephone: t = ParamTel; break; case EntityTelephone: t = ParamTel; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityEmail: t = ParamEmail; break; case EntityEmail: t = ParamEmail; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityKey: t = ParamTextBin; break; case EntityKey: t = ParamTextBin; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityExtension: t = ParamTextNS; break; case EntityExtension: t = ParamTextNS; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityAddress: case EntityAddress:
case EntityLabel: t = ParamAddrText; break; case EntityLabel: t = ParamAddrText; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityBirthday: case EntityBirthday:
case EntityRevision: t = ParamDate; break; case EntityRevision: t = ParamDate; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityPhoto: case EntityPhoto:
case EntityLogo: t = ParamImage; break; case EntityLogo: t = ParamImage; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityOrganisation: case EntityOrganisation:
case EntityTitle: case EntityTitle:
case EntityRole: case EntityRole:
@ -142,7 +146,7 @@ VCARD::EntityTypeToParamType(EntityType e)
case EntityNickname: case EntityNickname:
case EntityCategories: case EntityCategories:
case EntityNote: t = ParamText; break; case EntityNote: t = ParamText; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityProductID: case EntityProductID:
case EntityTimeZone: case EntityTimeZone:
case EntityUID: case EntityUID:
@ -152,11 +156,12 @@ VCARD::EntityTypeToParamType(EntityType e)
case EntityName: case EntityName:
case EntityVersion: case EntityVersion:
case EntityProfile: case EntityProfile:
case EntityURI:
default: t = ParamNone; break; default: t = ParamNone; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
} }
return t; return t;
} }
@ -166,40 +171,40 @@ VCARD::EntityTypeToValueType(EntityType e)
ValueType t(ValueUnknown); ValueType t(ValueUnknown);
switch (e) { switch (e) {
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntitySound: t = ValueSound; break; case EntitySound: t = ValueSound; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityAgent: t = ValueAgent; break; case EntityAgent: t = ValueAgent; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityAddress: t = ValueAddress; break; case EntityAddress: t = ValueAddress; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityTelephone: t = ValueTel; break; case EntityTelephone: t = ValueTel; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityKey: t = ValueTextBin; break; case EntityKey: t = ValueTextBin; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityOrganisation: t = ValueOrg; break; case EntityOrganisation: t = ValueOrg; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityN: t = ValueN; break; case EntityN: t = ValueN; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityTimeZone: t = ValueUTC; break; case EntityTimeZone: t = ValueUTC; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityClass: t = ValueClass; break; case EntityClass: t = ValueClass; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityGeo: t = ValueGeo; break; case EntityGeo: t = ValueGeo; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntitySource: case EntitySource:
case EntityURL: t = ValueURI; break; case EntityURL: t = ValueURI; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityPhoto: case EntityPhoto:
case EntityLogo: t = ValueImage; break; case EntityLogo: t = ValueImage; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityBirthday: case EntityBirthday:
case EntityRevision: t = ValueDate; break; case EntityRevision: t = ValueDate; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityCategories: case EntityCategories:
case EntityNickname: t = ValueTextList; break; case EntityNickname: t = ValueTextList; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
case EntityLabel: case EntityLabel:
case EntityExtension: case EntityExtension:
case EntityEmail: case EntityEmail:
@ -214,11 +219,12 @@ VCARD::EntityTypeToValueType(EntityType e)
case EntityProfile: case EntityProfile:
case EntityUID: case EntityUID:
case EntityNote: case EntityNote:
case EntityURI:
default: t = ValueText; break; default: t = ValueText; break;
//---------------------------------------------------------------// //---------------------------------------------------------------//
} }
return t; return t;
} }
@ -233,9 +239,9 @@ VCARD::EntityTypeToParamName(EntityType e)
VCARD::EntityNameToEntityType(const QCString & s) VCARD::EntityNameToEntityType(const QCString & s)
{ {
if (s.isEmpty()) return EntityUnknown; if (s.isEmpty()) return EntityUnknown;
EntityType t(EntityUnknown); EntityType t(EntityUnknown);
switch (s[0]) { switch (s[0]) {
case 'A': case 'A':
@ -288,7 +294,7 @@ VCARD::EntityNameToEntityType(const QCString & s)
if (s == "MAILER") if (s == "MAILER")
t = EntityMailer; t = EntityMailer;
break; break;
case 'N': case 'N':
if (s == "N") if (s == "N")
t = EntityN; t = EntityN;
@ -313,14 +319,14 @@ VCARD::EntityNameToEntityType(const QCString & s)
else if (s == "PROFILE") else if (s == "PROFILE")
t = EntityProfile; t = EntityProfile;
break; break;
case 'R': case 'R':
if (s == "REV") if (s == "REV")
t = EntityRevision; t = EntityRevision;
else if (s == "ROLE") else if (s == "ROLE")
t = EntityRole; t = EntityRole;
break; break;
case 'S': case 'S':
if (s == "SORT-STRING") if (s == "SORT-STRING")
t = EntitySortString; t = EntitySortString;
@ -344,6 +350,8 @@ VCARD::EntityNameToEntityType(const QCString & s)
t = EntityUID; t = EntityUID;
else if (s == "URL") else if (s == "URL")
t = EntityURL; t = EntityURL;
else if (s == "URI")
t = EntityURI;
case 'V': case 'V':
if (s == "VERSION") if (s == "VERSION")
t = EntityVersion; t = EntityVersion;
@ -353,12 +361,12 @@ VCARD::EntityNameToEntityType(const QCString & s)
if (s.left(2) == "X-") if (s.left(2) == "X-")
t = EntityExtension; t = EntityExtension;
break; break;
default: default:
t = EntityUnknown; t = EntityUnknown;
} }
return t; return t;
} }
@ -389,7 +397,7 @@ VCARD::EntityNameToEntityType(const QCString & s)
* *
*/ */
static char B64[] = static char B64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
// the mime base64 disctionary used for decoding // the mime base64 disctionary used for decoding

5
kabc/vcard/include/VCardEnum.h
Unescape View File

@ -1,8 +1,8 @@
/* /*
libvcard - vCard parsing library for vCard version 3.0 libvcard - vCard parsing library for vCard version 3.0
Copyright (C) 1999 Rik Hemsley rik@kde.org Copyright (C) 1999 Rik Hemsley rik@kde.org
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the deal in the Software without restriction, including without limitation the
@ -61,6 +61,7 @@ enum EntityType {
EntitySortString, EntitySortString,
EntitySound, EntitySound,
EntityUID, EntityUID,
EntityURI,
EntityURL, EntityURL,
EntityVersion, EntityVersion,
EntityClass, EntityClass,

5
kabc/vcardformatimpl.cpp
Unescape View File

@ -137,6 +137,10 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
addressee.setUid( readTextValue( cl ) ); addressee.setUid( readTextValue( cl ) );
break; break;
case EntityURI:
addressee.setUri( readTextValue( cl ) );
break;
case EntityEmail: case EntityEmail:
addressee.insertEmail( readTextValue( cl ) ); addressee.insertEmail( readTextValue( cl ) );
break; break;
@ -278,6 +282,7 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v
addTextValue( v, EntityName, addressee.name() ); addTextValue( v, EntityName, addressee.name() );
addTextValue( v, EntityUID, addressee.uid() ); addTextValue( v, EntityUID, addressee.uid() );
addTextValue( v, EntityURI, addressee.uri() );
addTextValue( v, EntityFullName, addressee.formattedName() ); addTextValue( v, EntityFullName, addressee.formattedName() );
QStringList emails = addressee.emails(); QStringList emails = addressee.emails();

86
kabc/vcardparser/vcardparser.cpp
Unescape View File

@ -227,54 +227,64 @@ QString VCardParser::createVCards( const VCard::List& list )
// iterate over the lines // iterate over the lines
for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) { for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) {
if ( !(*lineIt).value().asString().isEmpty() ) { if ( !(*lineIt).value().asString().isEmpty() ) {
if ( (*lineIt).hasGroup() ) if ((*lineIt).identifier() != QString("URI")) {
textLine = (*lineIt).group() + "." + (*lineIt).identifier(); if ( (*lineIt).hasGroup() )
else textLine = (*lineIt).group() + "." + (*lineIt).identifier();
textLine = (*lineIt).identifier(); else
textLine = (*lineIt).identifier();
params = (*lineIt).parameterList();
hasEncoding = false; params = (*lineIt).parameterList();
if ( params.count() > 0 ) { // we have parameters hasEncoding = false;
for ( paramIt = params.begin(); paramIt != params.end(); ++paramIt ) { if ( params.count() > 0 ) { // we have parameters
if ( (*paramIt) == "encoding" ) { for ( paramIt = params.begin(); paramIt != params.end(); ++paramIt ) {
hasEncoding = true; if ( (*paramIt) == "encoding" ) {
encodingType = (*lineIt).parameter( "encoding" ).lower(); hasEncoding = true;
encodingType = (*lineIt).parameter( "encoding" ).lower();
}
values = (*lineIt).parameters( *paramIt );
for ( valueIt = values.constBegin(); valueIt != values.constEnd(); ++valueIt ) {
textLine.append( ";" + (*paramIt).upper() );
if ( !(*valueIt).isEmpty() )
textLine.append( "=" + (*valueIt) );
}
} }
}
values = (*lineIt).parameters( *paramIt ); if ( hasEncoding ) { // have to encode the data
for ( valueIt = values.constBegin(); valueIt != values.constEnd(); ++valueIt ) { QByteArray input, output;
textLine.append( ";" + (*paramIt).upper() ); if ( encodingType == "b" ) {
if ( !(*valueIt).isEmpty() ) input = (*lineIt).value().toByteArray();
textLine.append( "=" + (*valueIt) ); KCodecs::base64Encode( input, output );
} else if ( encodingType == "quoted-printable" ) {
input = (*lineIt).value().toString().utf8();
input.resize( input.size() - 1 ); // strip \0
KCodecs::quotedPrintableEncode( input, output, false );
} }
}
}
if ( hasEncoding ) { // have to encode the data QString value( output );
QByteArray input, output; addEscapes( value );
if ( encodingType == "b" ) { textLine.append( ":" + value );
input = (*lineIt).value().toByteArray(); } else {
KCodecs::base64Encode( input, output ); QString value( (*lineIt).value().asString() );
} else if ( encodingType == "quoted-printable" ) { addEscapes( value );
input = (*lineIt).value().toString().utf8(); textLine.append( ":" + value );
input.resize( input.size() - 1 ); // strip \0
KCodecs::quotedPrintableEncode( input, output, false );
} }
QString value( output ); if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line
addEscapes( value ); for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
textLine.append( ":" + value ); text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );
} else { } else
text.append( textLine + "\r\n" );
}
else {
// URIs can be full of weird symbols, etc. so bypass all checks
textLine = (*lineIt).identifier();
QString value( (*lineIt).value().asString() ); QString value( (*lineIt).value().asString() );
addEscapes( value ); addEscapes( value );
textLine.append( ":" + value ); textLine.append( ":" + value );
}
if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line
for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );
} else
text.append( textLine + "\r\n" ); text.append( textLine + "\r\n" );
}
} }
} }
} }

7
kabc/vcardtool.cpp
Unescape View File

@ -320,6 +320,9 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// UID // UID
card.addLine( VCardLine( "UID", (*addrIt).uid() ) ); card.addLine( VCardLine( "UID", (*addrIt).uid() ) );
// UID
card.addLine( VCardLine( "URI", (*addrIt).uri() ) );
// URL // URL
card.addLine( VCardLine( "URL", (*addrIt).url().url() ) ); card.addLine( VCardLine( "URL", (*addrIt).url().url() ) );
@ -580,6 +583,10 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
else if ( identifier == "uid" ) else if ( identifier == "uid" )
addr.setUid( (*lineIt).value().asString() ); addr.setUid( (*lineIt).value().asString() );
// URI
else if ( identifier == "uri" )
addr.setUri( (*lineIt).value().asString() );
// URL // URL
else if ( identifier == "url" ) else if ( identifier == "url" )
addr.setUrl( KURL( (*lineIt).value().asString() ) ); addr.setUrl( KURL( (*lineIt).value().asString() ) );

Write Preview
Loading…
Cancel
Save