Merge lp:~isoschiz/xmppframework/vcard-temp into lp:xmppframework

[Martin Morrison]

Implementation of XEP-0054.

(Note: there are a few missing functions. Pushing this out for review of the API).

Unmerged revisions

148. By Martin Morrison <email address hidden> on 2010-08-28

Implementation of XEP-0054. Note there are a few missing functions still, to be completed in a future commit.

=== added directory 'Extensions'
=== added file 'Extensions/XMPPvCardTemp.h'
--- Extensions/XMPPvCardTemp.h	1970-01-01 00:00:00 +0000
+++ Extensions/XMPPvCardTemp.h	2010-08-28 10:45:53 +0000
@@ -0,0 +1,294 @@
+//
+//  XMPPvCardTemp.h
+//  Jibberer
+//
+//  Created by Martin Morrison on 24/07/2010.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+#if TARGET_OS_IPHONE
+#import "DDXML.h"
+#endif
+
+#import "XMPPJID.h"
+#import "XMPPModule.h"
+#import "XMPPStream.h"
+#import "NSXMLElementAdditions.h"
+
+/*
+ * Implementation of XEP-0054 vCard-temp
+ *
+ * Consists of the following classes/protocols:
+ * - XMPPvCard - the XMPPModule. Instantiate one of these to fetch vCards.
+ * - XMPPvCardStorage - protocol for persistence of vCards. A default in-memory implementation is provided.
+ * - XMPPvCardDelegate - protocol for objects wishing to be notified of new vCards.
+ *
+ * The following are all NSXMLElement subclasses providing accessor methods for the supported fields:
+ * - XMPPvCard - represents a <vCard/> element.
+ * - XMPPvCardEmail - an <EMAIL/> child of a <vCard/> element.
+ * - XMPPvCardTel - a <TEL/> child of a <vCard/> element.
+ * - XMPPvCardAdr - an <ADR/> child of a <vCard/> element.
+ * - XMPPvCardLabel - a <LABEL/> child of a <vCard/> element.
+ * - (XMPPvCardAdrTypes - superclass of XMPPvCardAdr and XMPPvCardLabel providing common accessors).
+ */
+
+#define XMPP_VCARD_NS @"vcard-temp"
+
+@protocol XMPPvCardTempDelegate;
+@class XMPPvCard;
+
+#pragma mark -
+#pragma mark XMPPvCardStorage
+
+@protocol XMPPvCardStorage <NSObject>
+
+/*
+ * Return whether a vCard for the given JID is saved.
+ */
+- (BOOL)havevCardForJID:(XMPPJID *)jid;
+
+/*
+ * Get the vCard for the given JID.
+ */
+- (XMPPvCard *)getvCardForJID:(XMPPJID *)jid;
+
+/*
+ * Save the given vCard for the given JID.
+ */
+- (void)savevCard:(XMPPvCard *)vCard forJID:(XMPPJID *)jid;
+
+/*
+ * Clear any stored vCard for the given JID.
+ */
+- (void)clearvCardForJID:(XMPPJID *)jid;
+
+@end
+
+/*
+ * Basic storage implementation.
+ */
+@interface XMPPvCardMemoryStorage : NSObject <XMPPvCardStorage> {
+	NSMutableDictionary *vcards;
+}
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardTemp
+
+/*
+ * Provides a wrapper for XEP-0054
+ */
+@interface XMPPvCardTemp : XMPPModule <XMPPStreamDelegate> {
+	XMPPvCard *myvCard;
+	id <XMPPvCardStorage> storage;
+	BOOL autoFetchvCards;
+}
+
+@property (nonatomic, retain, readonly) id <XMPPvCardStorage> storage;
+@property (nonatomic, assign) BOOL autoFetchvCards;
+
+/*
+ * If storage is unspecified, uses a default memory backed cacher.
+ */
+- (id)initWithStream:(XMPPStream *)stream;
+- (id)initWithStream:(XMPPStream *)stream storage:(id <XMPPvCardStorage>)storage;
+
+/*
+ * Initiate a fetch for the vCard for the given user. If the storage object
+ * already has a vCard for the given JID, then this has no effect.
+ */
+- (void)fetchvCardForJID:(XMPPJID *)jid;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardAdrTypes
+
+@interface XMPPvCardAdrTypes : NSXMLElement
+
+@property (nonatomic, assign, setter=setHome) BOOL isHome;
+@property (nonatomic, assign, setter=setWork) BOOL isWork;
+@property (nonatomic, assign, setter=setParcel) BOOL isParcel;
+@property (nonatomic, assign, setter=setPostal) BOOL isPostal;
+@property (nonatomic, assign, setter=setDomestic) BOOL isDomestic;
+@property (nonatomic, assign, setter=setInternational) BOOL isInternational;
+@property (nonatomic, assign, setter=setPreferred) BOOL isPreferred;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardAdr
+
+@interface XMPPvCardAdr : XMPPvCardAdrTypes
+
++ (XMPPvCardAdr *)vCardAdrFromElement:(NSXMLElement *)elem;
+
+@property (nonatomic, assign) NSString *pobox;
+@property (nonatomic, assign) NSString *extendedAddress;
+@property (nonatomic, assign) NSString *street;
+@property (nonatomic, assign) NSString *locality;
+@property (nonatomic, assign) NSString *region;
+@property (nonatomic, assign) NSString *postalCode;
+@property (nonatomic, assign) NSString *country;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardLabel
+
+@interface XMPPvCardLabel : XMPPvCardAdrTypes
+
++ (XMPPvCardLabel *)vCardLabelFromElement:(NSXMLElement *)elem;
+
+@property (nonatomic, assign) NSArray *lines;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardTel
+
+@interface XMPPvCardTel : NSXMLElement
+
++ (XMPPvCardTel *)vCardTelFromElement:(NSXMLElement *)elem;
+
+@property (nonatomic, assign, setter=setHome) BOOL isHome;
+@property (nonatomic, assign, setter=setWork) BOOL isWork;
+@property (nonatomic, assign, setter=setVoice) BOOL isVoice;
+@property (nonatomic, assign, setter=setFax) BOOL isFax;
+@property (nonatomic, assign, setter=setPager) BOOL isPager;
+@property (nonatomic, assign, setter=setMessaging) BOOL hasMessaging;
+@property (nonatomic, assign, setter=setCell) BOOL isCell;
+@property (nonatomic, assign, setter=setVideo) BOOL isVideo;
+@property (nonatomic, assign, setter=setBBS) BOOL isBBS;
+@property (nonatomic, assign, setter=setModem) BOOL isModem;
+@property (nonatomic, assign, setter=setISDN) BOOL isISDN;
+@property (nonatomic, assign, setter=setPCS) BOOL isPCS;
+@property (nonatomic, assign, setter=setPreferred) BOOL isPreferred;
+@property (nonatomic, assign) NSString *number;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardEmail
+
+@interface XMPPvCardEmail : NSXMLElement
+
++ (XMPPvCardEmail *)vCardEmailFromElement:(NSXMLElement *)elem;
+
+@property (nonatomic, assign, setter=setHome) BOOL isHome;
+@property (nonatomic, assign, setter=setWork) BOOL isWork;
+@property (nonatomic, assign, setter=setInternet) BOOL isInternet;
+@property (nonatomic, assign, setter=setX400) BOOL isX400;
+@property (nonatomic, assign, setter=setPreferred) BOOL isPreferred;
+@property (nonatomic, assign) NSString *userid;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCard
+
+typedef enum _XMPPvCardClass {
+	XMPPvCardClassNone,
+	XMPPvCardClassPublic,
+	XMPPvCardClassPrivate,
+	XMPPvCardClassConfidential,
+} XMPPvCardClass;
+
+/*
+ * Note: according to the DTD, every fields bar N and FN can appear multiple times.
+ * The provided accessors only support this for the field types where multiple
+ * entries make sense - for the others, if required, the NSXMLElement accessors
+ * must be used.
+ */
+@interface XMPPvCard : NSXMLElement
+
++ (XMPPvCard *)vCardFromElement:(NSXMLElement *)element;
+
+#pragma mark Identification Types
+
+@property (nonatomic, assign) NSDate *bday;
+@property (nonatomic, assign) NSData *photo;
+@property (nonatomic, assign) NSString *nickname;
+@property (nonatomic, assign) NSString *formattedName;
+@property (nonatomic, assign) NSString *familyName;
+@property (nonatomic, assign) NSString *givenName;
+@property (nonatomic, assign) NSString *middleName;
+@property (nonatomic, assign) NSString *prefix;
+@property (nonatomic, assign) NSString *suffix;
+
+#pragma mark Delivery Addressing Types
+
+@property (nonatomic, assign) NSArray *addresses;
+- (void)addAddress:(XMPPvCardAdr *)adr;
+- (void)removeAddress:(XMPPvCardAdr *)adr;
+- (void)clearAddresses;
+
+@property (nonatomic, assign) NSArray *labels;
+- (void)addLabel:(XMPPvCardLabel *)label;
+- (void)removeLabel:(XMPPvCardLabel *)label;
+- (void)clearLabels;
+
+@property (nonatomic, assign) NSArray *telecomsAddresses;
+- (void)addTelecomsAddress:(XMPPvCardTel *)tel;
+- (void)removeTelecomsAddress:(XMPPvCardTel *)tel;
+- (void)clearTelecomsAddresses;
+
+@property (nonatomic, assign) NSArray *emailAddresses;
+- (void)addEmailAddress:(XMPPvCardEmail *)email;
+- (void)removeEmailAddress:(XMPPvCardEmail *)email;
+- (void)clearEmailAddresses;
+
+@property (nonatomic, assign) XMPPJID *jid;
+@property (nonatomic, assign) NSString *mailer;
+
+#pragma mark Geographical Types
+
+@property (nonatomic, assign) NSTimeZone *timeZone;
+@property (nonatomic, assign) CLLocation *location;
+
+#pragma mark Organizational Types
+
+@property (nonatomic, assign) NSString *title;
+@property (nonatomic, assign) NSString *role;
+@property (nonatomic, assign) NSData *logo;
+@property (nonatomic, assign) XMPPvCard *agent;
+@property (nonatomic, assign) NSString *orgName;
+
+/*
+ * ORGUNITs can only be set if there is already an ORGNAME. Otherwise, changes are ignored.
+ */
+@property (nonatomic, assign) NSArray *orgUnits;
+
+#pragma mark Explanatory Types
+
+@property (nonatomic, assign) NSArray *categories;
+@property (nonatomic, assign) NSString *note;
+@property (nonatomic, assign) NSString *prodid;
+@property (nonatomic, assign) NSDate *revision;
+@property (nonatomic, assign) NSString *sortString;
+@property (nonatomic, assign) NSString *phoneticSound;
+@property (nonatomic, assign) NSData *sound;
+@property (nonatomic, assign) NSString *uid;
+@property (nonatomic, assign) NSString *url;
+@property (nonatomic, assign) NSString *version;
+@property (nonatomic, assign) NSString *description;
+
+#pragma mark Security Types
+
+@property (nonatomic, assign) XMPPvCardClass privacyClass;
+@property (nonatomic, assign) NSData *key;
+@property (nonatomic, assign) NSString *keyType;
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardTempDelegate
+
+@protocol XMPPvCardTempDelegate
+@optional
+
+- (void)xmppvCard:(XMPPvCardTemp *)vCardMod didReceivevCard:(XMPPvCard *)vCard forJID:(XMPPJID *)jid;
+
+@end
\ No newline at end of file

=== added file 'Extensions/XMPPvCardTemp.m'
--- Extensions/XMPPvCardTemp.m	1970-01-01 00:00:00 +0000
+++ Extensions/XMPPvCardTemp.m	2010-08-28 10:45:53 +0000
@@ -0,0 +1,1358 @@
+//
+//  XMPPvCardTemp.m
+//  Jibberer
+//
+//  Created by Martin Morrison on 24/07/2010.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <objc/runtime.h>
+
+#import "XMPPvCardTemp.h"
+#import "XMPPIQ.h"
+#import "XMPPJID.h"
+#import "XMPPPresence.h"
+#import "XMPPStream.h"
+#import "NSDataAdditions.h"
+#import "XMPPDateTimeProfiles.h"
+
+#import "NSXMLElementAdditions.h"
+
+#define XMPP_VCARD_SET_EMPTY_CHILD(Set, Name)													\
+	if (Set) {																					\
+		NSXMLElement *elem = [NSXMLElement elementWithName:(Name)];								\
+		[self addChild:elem];																	\
+	} else if (!(Set)) {																		\
+		[self removeChildAtIndex:[[self children] indexOfObject:[self elementForName:(Name)]]];	\
+	}
+
+#define XMPP_VCARD_SET_STRING_CHILD(Value, Name)						\
+	NSXMLElement *elem = [self elementForName:(Name)];					\
+	if ((Value) != nil) {												\
+		if (elem == nil) {												\
+			elem = [NSXMLElement elementWithName:(Name)];				\
+		}																\
+		[elem setStringValue:(Value)];									\
+	} else if (elem != nil) {											\
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];	\
+	}
+
+#define XMPP_VCARD_SET_N_CHILD(Value, Name)								\
+	NSXMLElement *name = [self elementForName:@"N"];					\
+	if ((Value) != nil && name == nil) {								\
+		name = [NSXMLElement elementWithName:@"N"];						\
+		[self addChild:name];											\
+	}																	\
+	NSXMLElement *part = [name elementForName:(Name)];					\
+	if ((Value) != nil && part == nil) {								\
+		part = [NSXMLElement elementWithName:(Name)];					\
+		[name addChild:part];											\
+	}																	\
+	if (Value) {														\
+		[part setStringValue:(Value)];									\
+	} else if (part != nil) {											\
+		/* N is mandatory, so we leave it in. */						\
+		[name removeChildAtIndex:[[self children] indexOfObject:part]];	\
+	}
+
+#pragma mark -
+#pragma mark XMPPvCardMemoryStorage
+
+@implementation XMPPvCardMemoryStorage
+
+- (id)init {
+	if (self == [super init]) {
+		vcards = [[NSMutableDictionary alloc] init];
+	}
+	
+	return self;
+}
+
+- (void)dealloc {
+	[vcards release];
+	[super dealloc];
+}
+
+- (BOOL)havevCardForJID:(XMPPJID *)jid {
+	return [vcards objectForKey:jid] != nil;
+}
+
+- (XMPPvCard *)getvCardForJID:(XMPPJID *)jid {
+	NSLog(@"+++++ Fetching vCard for %@: %@", jid, [[vcards objectForKey:jid] compactXMLString]);
+	return [vcards objectForKey:jid];
+}
+
+- (void)savevCard:(XMPPvCard *)vCard forJID:(XMPPJID *)jid {
+	NSLog(@"+++++ Storing vCard for %@: %@", jid, [vCard compactXMLString]);
+	[vcards setObject:vCard forKey:jid];
+}
+
+- (void)clearvCardForJID:(XMPPJID *)jid {
+	[vcards removeObjectForKey:jid];
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardTemp
+
+@implementation XMPPvCardTemp
+
+@synthesize autoFetchvCards;
+@synthesize storage;
+
+- (id)initWithStream:(XMPPStream *)stream {
+	return [self initWithStream:stream storage:[[[XMPPvCardMemoryStorage alloc] init] autorelease]];
+}
+
+- (id)initWithStream:(XMPPStream *)stream storage:(id <XMPPvCardStorage>)aStorage {
+	if (self == [super initWithStream:stream]) {
+		storage = [aStorage retain];
+		autoFetchvCards = NO;
+	}
+	return self;
+}
+
+/*- (UIImage *)photoForJID:(XMPPJID *)jid {
+	UIImage *image = nil;
+	
+	NSXMLElement *vCard = [storage vCardForJID:jid];
+	NSXMLElement *photo = [vCard elementForName:@"PHOTO"];
+	
+	if (photo) {
+		// There is a PHOTO element. It should have a TYPE and a BINVAL
+		//NSXMLElement *fileType = [photo elementForName:@"TYPE"];
+		NSXMLElement *binval = [photo elementForName:@"BINVAL"];
+		
+		if (binval) {
+			NSData *base64Data = [[binval stringValue] dataUsingEncoding:NSASCIIStringEncoding];
+			NSData *decodedData = [base64Data base64Decoded];
+			
+			image = [UIImage imageWithData:decodedData];
+		}
+	}
+	
+	if (!image) {
+		image = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"user_48x48" ofType:@"png"]];
+	}
+	
+	return image;
+}*/
+
+- (void)dealloc {
+	[storage release];
+	storage = nil;
+
+	[super dealloc];
+}
+
+- (void)fetchvCardForJID:(XMPPJID *)jid {
+	// Check whether we already have a vCard
+	jid = [jid bareJID];
+	if (![storage havevCardForJID:jid]) {
+		// Not got it yet. Let's make a request for the vCard
+		XMPPIQ *iq = [XMPPIQ iqWithType:@"get" to:jid];
+		NSXMLElement *vCardElem = [NSXMLElement elementWithName:@"vCard" xmlns:XMPP_VCARD_NS];
+		
+		[iq addChild:vCardElem];
+		
+		[xmppStream sendElement:iq];
+	}
+}
+
+// Delegate protocol
+
+- (BOOL)xmppStream:(XMPPStream *)sender didReceiveIQ:(XMPPIQ *)iq {
+	NSXMLElement *elem = [iq elementForName:@"vCard" xmlns:XMPP_VCARD_NS];
+	NSLog(@"Received IQ in vCard module with elem: %@", elem);
+	if (elem != nil) {
+		XMPPvCard *vCard = [XMPPvCard vCardFromElement:elem];
+		[storage savevCard:vCard forJID:[iq from]];
+		
+		[multicastDelegate xmppvCard:self didReceivevCard:vCard forJID:[iq from]];
+	}
+	
+	return NO;
+}
+
+- (void)xmppStream:(XMPPStream *)sender didReceivePresence:(XMPPPresence *)presence {
+	// We use this to track online buddies
+	if (autoFetchvCards &&
+		[presence from] != [xmppStream myJID] &&
+		[presence status] != @"unavailable" &&
+		[presence from] != nil) {
+
+		[self fetchvCardForJID:[presence from]];
+	}
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardAdrTypes
+
+@implementation XMPPvCardAdrTypes
+
+- (BOOL)isHome {
+	return [self elementForName:@"HOME"] != nil;
+}
+
+- (void)setHome:(BOOL)home {
+	XMPP_VCARD_SET_EMPTY_CHILD(home && ![self isHome], @"HOME");
+}
+
+- (BOOL)isWork {
+	return [self elementForName:@"WORK"] != nil;
+}
+
+- (void)setWork:(BOOL)work {
+	XMPP_VCARD_SET_EMPTY_CHILD(work && ![self isWork], @"WORK");
+}
+
+- (BOOL)isParcel {
+	return [self elementForName:@"PARCEL"] != nil;
+}
+- (void)setParcel:(BOOL)parcel {
+	XMPP_VCARD_SET_EMPTY_CHILD(parcel && ![self isParcel], @"PARCEL");
+}
+
+- (BOOL)isPostal {
+	return [self elementForName:@"POSTAL"] != nil;
+}
+- (void)setPostal:(BOOL)postal {
+	XMPP_VCARD_SET_EMPTY_CHILD(postal && ![self isPostal], @"POSTAL");
+}
+
+- (BOOL)isDomestic {
+	return [self elementForName:@"DOM"] != nil;
+}
+- (void)setDomestic:(BOOL)dom {
+	XMPP_VCARD_SET_EMPTY_CHILD(dom && ![self isDomestic], @"DOM");
+	// INTL and DOM are mutually exclusive
+	if (dom) {
+		[self setInternational:NO];
+	}
+}
+
+- (BOOL)isInternational {
+	return [self elementForName:@"INTL"] != nil;
+}
+- (void)setInternational:(BOOL)intl {
+	XMPP_VCARD_SET_EMPTY_CHILD(intl && ![self isInternational], @"INTL");
+	// INTL and DOM are mutually exclusive
+	if (intl) {
+		[self setDomestic:NO];
+	}
+}
+
+- (BOOL)isPreferred {
+	return [self elementForName:@"PREF"] != nil;
+}
+- (void)setPreferred:(BOOL)pref {
+	XMPP_VCARD_SET_EMPTY_CHILD(pref && ![self isPreferred], @"PREF");
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardAdr
+
+@implementation XMPPvCardAdr
+
++ (void)initialize {
+	// We use the object_setClass method below to dynamically change the class from a standard NSXMLElement.
+	// The size of the two classes is expected to be the same.
+	// 
+	// If a developer adds instance methods to this class, bad things happen at runtime that are very hard to debug.
+	// This check is here to aid future developers who may make this mistake.
+	// 
+	// For Fearless And Experienced Objective-C Developers:
+	// It may be possible to support adding instance variables to this class if you seriously need it.
+	// To do so, try realloc'ing self after altering the class, and then initialize your variables.
+	
+	size_t superSize = class_getInstanceSize([NSXMLElement class]);
+	size_t ourSize   = class_getInstanceSize([XMPPvCardAdr class]);
+	
+	if (superSize != ourSize)
+	{
+		NSLog(@"Adding instance variables to XMPPvCardAdr is not currently supported!");
+		exit(15);
+	}
+}
+
++ (XMPPvCardAdr *)vCardAdrFromElement:(NSXMLElement *)elem {
+	object_setClass(elem, [XMPPvCardAdr class]);
+
+	return (XMPPvCardAdr *)elem;
+}
+
+- (NSString *)pobox {
+	return [[self elementForName:@"POBOX"] stringValue];
+}
+- (void)setPobox:(NSString *)pobox {
+	XMPP_VCARD_SET_STRING_CHILD(pobox, @"POBOX");
+}
+
+- (NSString *)extendedAddress {
+	return [[self elementForName:@"EXTADD"] stringValue];
+}
+- (void)setExtendedAddress:(NSString *)extadd {
+	XMPP_VCARD_SET_STRING_CHILD(extadd, @"EXTADD");
+}	
+
+- (NSString *)street {
+	return [[self elementForName:@"STREET"] stringValue];
+}
+- (void)setStreet:(NSString *)street {
+	XMPP_VCARD_SET_STRING_CHILD(street, @"STREET");
+}
+
+- (NSString *)locality {
+	return [[self elementForName:@"LOCALITY"] stringValue];
+}
+- (void)setLocality:(NSString *)locality {
+	XMPP_VCARD_SET_STRING_CHILD(locality, @"LOCALITY");
+}
+
+- (NSString *)region {
+	return [[self elementForName:@"REGION"] stringValue];
+}
+- (void)setRegion:(NSString *)region {
+	XMPP_VCARD_SET_STRING_CHILD(region, @"REGION");
+}
+
+- (NSString *)postalCode {
+	return [[self elementForName:@"PCODE"] stringValue];
+}
+- (void)setPostalCode:(NSString *)pcode {
+	XMPP_VCARD_SET_STRING_CHILD(pcode, @"PCODE");
+}
+
+- (NSString *)country {
+	return [[self elementForName:@"CTRY"] stringValue];
+}
+- (void)setCountry:(NSString *)ctry {
+	XMPP_VCARD_SET_STRING_CHILD(ctry, @"CTRY");
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardLabel
+
+@implementation XMPPvCardLabel
+
++ (void)initialize {
+	// We use the object_setClass method below to dynamically change the class from a standard NSXMLElement.
+	// The size of the two classes is expected to be the same.
+	// 
+	// If a developer adds instance methods to this class, bad things happen at runtime that are very hard to debug.
+	// This check is here to aid future developers who may make this mistake.
+	// 
+	// For Fearless And Experienced Objective-C Developers:
+	// It may be possible to support adding instance variables to this class if you seriously need it.
+	// To do so, try realloc'ing self after altering the class, and then initialize your variables.
+	
+	size_t superSize = class_getInstanceSize([NSXMLElement class]);
+	size_t ourSize   = class_getInstanceSize([XMPPvCardLabel class]);
+	
+	if (superSize != ourSize)
+	{
+		NSLog(@"Adding instance variables to XMPPvCardLabel is not currently supported!");
+		exit(15);
+	}
+}
+
++ (XMPPvCardLabel *)vCardLabelFromElement:(NSXMLElement *)elem {
+	object_setClass(elem, [XMPPvCardLabel class]);
+	
+	return (XMPPvCardLabel *)elem;
+}
+
+- (NSArray *)lines {
+	NSArray *elems = [self elementsForName:@"LINE"];
+	NSMutableArray *lines = [[NSMutableArray alloc] initWithCapacity:[elems count]];
+	
+	for (NSXMLElement *elem in elems) {
+		[lines addObject:[elem stringValue]];
+	}
+	
+	NSArray *result = [NSArray arrayWithArray:lines];
+	[lines release];
+	return result;
+}
+- (void)setLines:(NSArray *)lines {
+	NSArray *elems = [self elementsForName:@"LINE"];
+	
+	for (NSXMLElement *elem in elems) {
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+	}
+	
+	for (NSString *line in lines) {
+		NSXMLElement *elem = [NSXMLElement elementWithName:@"LINE"];
+		[elem setStringValue:line];
+		[self addChild:elem];
+	}
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardTel
+
+@implementation XMPPvCardTel
+
++ (void)initialize {
+	// We use the object_setClass method below to dynamically change the class from a standard NSXMLElement.
+	// The size of the two classes is expected to be the same.
+	// 
+	// If a developer adds instance methods to this class, bad things happen at runtime that are very hard to debug.
+	// This check is here to aid future developers who may make this mistake.
+	// 
+	// For Fearless And Experienced Objective-C Developers:
+	// It may be possible to support adding instance variables to this class if you seriously need it.
+	// To do so, try realloc'ing self after altering the class, and then initialize your variables.
+	
+	size_t superSize = class_getInstanceSize([NSXMLElement class]);
+	size_t ourSize   = class_getInstanceSize([XMPPvCardTel class]);
+	
+	if (superSize != ourSize)
+	{
+		NSLog(@"Adding instance variables to XMPPvCardTel is not currently supported!");
+		exit(15);
+	}
+}
+
++ (XMPPvCardTel *)vCardTelFromElement:(NSXMLElement *)elem {
+	object_setClass(elem, [XMPPvCardTel class]);
+	
+	return (XMPPvCardTel *)elem;
+}
+
+- (BOOL)isHome {
+	return [self elementForName:@"HOME"] != nil;
+}
+- (void)setHome:(BOOL)home {
+	XMPP_VCARD_SET_EMPTY_CHILD(home && ![self isHome], @"HOME");
+}
+
+- (BOOL)isWork {
+	return [self elementForName:@"WORK"] != nil;
+}
+- (void)setWork:(BOOL)work {
+	XMPP_VCARD_SET_EMPTY_CHILD(work && ![self isWork], @"WORK");
+}
+
+- (BOOL)isVoice {
+	return [self elementForName:@"VOICE"] != nil;
+}
+- (void)setVoice:(BOOL)voice {
+	XMPP_VCARD_SET_EMPTY_CHILD(voice && ![self isVoice], @"VOICE");
+}
+
+- (BOOL)isFax {
+	return [self elementForName:@"FAX"] != nil;
+}
+- (void)setFax:(BOOL)fax {
+	XMPP_VCARD_SET_EMPTY_CHILD(fax && ![self isFax], @"FAX");
+}
+
+- (BOOL)isPager {
+	return [self elementForName:@"PAGER"] != nil;
+}
+- (void)setPager:(BOOL)pager {
+	XMPP_VCARD_SET_EMPTY_CHILD(pager && ![self isPager], @"PAGER");
+}
+
+- (BOOL)hasMessaging {
+	return [self elementForName:@"MSG"] != nil;
+}
+- (void)setMessaging:(BOOL)msg {
+	XMPP_VCARD_SET_EMPTY_CHILD(msg && ![self hasMessaging], @"MSG");
+}
+
+- (BOOL)isCell {
+	return [self elementForName:@"CELL"] != nil;
+}
+- (void)setCell:(BOOL)cell {
+	XMPP_VCARD_SET_EMPTY_CHILD(cell && ![self isCell], @"CELL");
+}
+
+- (BOOL)isVideo {
+	return [self elementForName:@"VIDEO"] != nil;
+}
+- (void)setVideo:(BOOL)video {
+	XMPP_VCARD_SET_EMPTY_CHILD(video && ![self isVideo], @"VIDEO");
+}
+
+- (BOOL)isBBS {
+	return [self elementForName:@"BBS"] != nil;
+}
+- (void)setBBS:(BOOL)bbs {
+	XMPP_VCARD_SET_EMPTY_CHILD(bbs && ![self isBBS], @"BBS");
+}
+
+- (BOOL)isModem {
+	return [self elementForName:@"MODEM"] != nil;
+}
+- (void)setModem:(BOOL)modem {
+	XMPP_VCARD_SET_EMPTY_CHILD(modem && ![self isModem], @"MODEM");
+}
+
+- (BOOL)isISDN {
+	return [self elementForName:@"ISDN"] != nil;
+}
+- (void)setISDN:(BOOL)isdn {
+	XMPP_VCARD_SET_EMPTY_CHILD(isdn && ![self isISDN], @"ISDN");
+}
+
+- (BOOL)isPCS {
+	return [self elementForName:@"PCS"] != nil;
+}
+- (void)setPCS:(BOOL)pcs {
+	XMPP_VCARD_SET_EMPTY_CHILD(pcs && ![self isPCS], @"PCS");
+}
+
+- (BOOL)isPreferred {
+	return [self elementForName:@"PREF"] != nil;
+}
+- (void)setPreferred:(BOOL)pref {
+	XMPP_VCARD_SET_EMPTY_CHILD(pref && ![self isPreferred], @"PREF");
+}
+
+- (NSString *)number {
+	return [[self elementForName:@"NUMBER"] stringValue];
+}
+- (void)setNumber:(NSString *)number {
+	XMPP_VCARD_SET_STRING_CHILD(number, @"NUMBER");
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCardEmail
+
+@implementation XMPPvCardEmail
+
++ (void)initialize {
+	// We use the object_setClass method below to dynamically change the class from a standard NSXMLElement.
+	// The size of the two classes is expected to be the same.
+	// 
+	// If a developer adds instance methods to this class, bad things happen at runtime that are very hard to debug.
+	// This check is here to aid future developers who may make this mistake.
+	// 
+	// For Fearless And Experienced Objective-C Developers:
+	// It may be possible to support adding instance variables to this class if you seriously need it.
+	// To do so, try realloc'ing self after altering the class, and then initialize your variables.
+	
+	size_t superSize = class_getInstanceSize([NSXMLElement class]);
+	size_t ourSize   = class_getInstanceSize([XMPPvCardEmail class]);
+	
+	if (superSize != ourSize)
+	{
+		NSLog(@"Adding instance variables to XMPPvCardEmail is not currently supported!");
+		exit(15);
+	}
+}
+
++ (XMPPvCardEmail *)vCardEmailFromElement:(NSXMLElement *)elem {
+	object_setClass(elem, [XMPPvCardEmail class]);
+	
+	return (XMPPvCardEmail *)elem;
+}
+
+- (BOOL)isHome {
+	return [self elementForName:@"HOME"] != nil;
+}
+- (void)setHome:(BOOL)home {
+	XMPP_VCARD_SET_EMPTY_CHILD(home && ![self isHome], @"HOME");
+}
+
+- (BOOL)isWork {
+	return [self elementForName:@"WORK"] != nil;
+}
+- (void)setWork:(BOOL)work {
+	XMPP_VCARD_SET_EMPTY_CHILD(work && ![self isWork], @"WORK");
+}
+
+- (BOOL)isInternet {
+	return [self elementForName:@"INTERNET"] != nil;
+}
+- (void)setInternet:(BOOL)internet {
+	XMPP_VCARD_SET_EMPTY_CHILD(internet && ![self isInternet], @"INTERNET");
+}
+
+- (BOOL)isX400 {
+	return [self elementForName:@"X400"] != nil;
+}
+- (void)setX400:(BOOL)x400 {
+	XMPP_VCARD_SET_EMPTY_CHILD(x400 && ![self isX400], @"X400");
+}
+
+- (BOOL)isPreferred {
+	return [self elementForName:@"PREF"] != nil;
+}
+- (void)setPreferred:(BOOL)pref {
+	XMPP_VCARD_SET_EMPTY_CHILD(pref && ![self isPreferred], @"PREF");
+}
+
+- (NSString *)userid {
+	return [[self elementForName:@"USERID"] stringValue];
+}
+- (void)setUserid:(NSString *)userid {
+	XMPP_VCARD_SET_STRING_CHILD(userid, @"USERID");
+}
+
+@end
+
+#pragma mark -
+#pragma mark XMPPvCard
+
+@implementation XMPPvCard
+
++ (void)initialize {
+	// We use the object_setClass method below to dynamically change the class from a standard NSXMLElement.
+	// The size of the two classes is expected to be the same.
+	// 
+	// If a developer adds instance methods to this class, bad things happen at runtime that are very hard to debug.
+	// This check is here to aid future developers who may make this mistake.
+	// 
+	// For Fearless And Experienced Objective-C Developers:
+	// It may be possible to support adding instance variables to this class if you seriously need it.
+	// To do so, try realloc'ing self after altering the class, and then initialize your variables.
+	
+	size_t superSize = class_getInstanceSize([NSXMLElement class]);
+	size_t ourSize   = class_getInstanceSize([XMPPvCard class]);
+	
+	if (superSize != ourSize)
+	{
+		NSLog(@"Adding instance variables to XMPPvCard is not currently supported!");
+		exit(15);
+	}
+}
+
++ (XMPPvCard *)vCardFromElement:(NSXMLElement *)elem {
+	object_setClass(elem, [XMPPvCard class]);
+	
+	return (XMPPvCard *)elem;
+}
+
+#pragma mark Identification Types
+
+- (NSDate *)bday {
+	NSDate *bday = nil;
+	NSXMLElement *elem = [self elementForName:@"BDAY"];
+	
+	if (elem != nil) {
+		bday = [NSDate dateWithXmppDateString:[elem stringValue]];
+	}
+	
+	return bday;
+}
+- (void)setBday:(NSDate *)bday {
+	NSXMLElement *elem = [self elementForName:@"BDAY"];
+
+	if (elem == nil) {
+		elem = [NSXMLElement elementWithName:@"BDAY"];
+		[self addChild:elem];
+	}
+	
+	[elem setStringValue:[bday xmppDateString]];
+}
+
+- (NSData *)photo {
+	NSData *decodedData = nil;
+	NSXMLElement *photo = [self elementForName:@"PHOTO"];
+	
+	if (photo != nil) {
+		// There is a PHOTO element. It should have a TYPE and a BINVAL
+		//NSXMLElement *fileType = [photo elementForName:@"TYPE"];
+		NSXMLElement *binval = [photo elementForName:@"BINVAL"];
+		
+		if (binval) {
+			NSData *base64Data = [[binval stringValue] dataUsingEncoding:NSASCIIStringEncoding];
+			decodedData = [base64Data base64Decoded];
+		}
+	}
+	
+	return decodedData;
+}
+- (void)setPhoto:(NSData *)data {
+	NSXMLElement *photo = [self elementForName:@"PHOTO"];
+	
+	if (photo == nil) {
+		photo = [NSXMLElement elementWithName:@"PHOTO"];
+		[self addChild:photo];
+	}
+	
+	NSXMLElement *binval = [photo elementForName:@"BINVAL"];
+	
+	if (binval == nil) {
+		binval = [NSXMLElement elementWithName:@"BINVAL"];
+		[photo addChild:binval];
+	}
+	
+	[binval setStringValue:[data base64Encoded]];
+}
+
+- (NSString *)nickname {
+	return [[self elementForName:@"NICKNAME"] stringValue];
+}
+- (void)setNickname:(NSString *)nick {
+	XMPP_VCARD_SET_STRING_CHILD(nick, @"NICKNAME");
+}
+
+- (NSString *)formattedName {
+	return [[self elementForName:@"FN"] stringValue];
+}
+- (void)setFormattedName:(NSString *)fn {
+	XMPP_VCARD_SET_STRING_CHILD(fn, @"FN");
+}
+
+- (NSString *)familyName {
+	NSString *result = nil;
+	NSXMLElement *name = [self elementForName:@"N"];
+	
+	if (name != nil) {
+		NSXMLElement *part = [name elementForName:@"FAMILY"];
+		
+		if (part != nil) {
+			result = [part stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setFamilyName:(NSString *)family {
+	XMPP_VCARD_SET_N_CHILD(family, @"FAMILY");
+}
+
+- (NSString *)givenName {
+	NSString *result = nil;
+	NSXMLElement *name = [self elementForName:@"N"];
+	
+	if (name != nil) {
+		NSXMLElement *part = [name elementForName:@"GIVEN"];
+		
+		if (part != nil) {
+			result = [part stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setGivenName:(NSString *)given {
+	XMPP_VCARD_SET_N_CHILD(given, @"GIVEN");
+}
+
+- (NSString *)middleName {
+	NSString *result = nil;
+	NSXMLElement *name = [self elementForName:@"N"];
+	
+	if (name != nil) {
+		NSXMLElement *part = [name elementForName:@"MIDDLE"];
+		
+		if (part != nil) {
+			result = [part stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setMiddleName:(NSString *)middle {
+	XMPP_VCARD_SET_N_CHILD(middle, @"MIDDLE");
+}
+
+- (NSString *)prefix {
+	NSString *result = nil;
+	NSXMLElement *name = [self elementForName:@"N"];
+	
+	if (name != nil) {
+		NSXMLElement *part = [name elementForName:@"PREFIX"];
+		
+		if (part != nil) {
+			result = [part stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setPrefix:(NSString *)prefix {
+	XMPP_VCARD_SET_N_CHILD(prefix, @"PREFIX");
+}
+
+- (NSString *)suffix {
+	NSString *result = nil;
+	NSXMLElement *name = [self elementForName:@"N"];
+	
+	if (name != nil) {
+		NSXMLElement *part = [name elementForName:@"SUFFIC"];
+		
+		if (part != nil) {
+			result = [part stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setSuffix:(NSString *)suffix {
+	XMPP_VCARD_SET_N_CHILD(suffix, @"SUFFIX");
+}
+
+#pragma mark Delivery Addressing Types
+
+- (NSArray *)addresses { return nil; }
+- (void)addAddress:(XMPPvCardAdr *)adr { }
+- (void)removeAddress:(XMPPvCardAdr *)adr { }
+- (void)setAddresses:(NSArray *)adrs { }
+- (void)clearAddresses { }
+
+- (NSArray *)labels { return nil; }
+- (void)addLabel:(XMPPvCardLabel *)label { }
+- (void)removeLabel:(XMPPvCardLabel *)label { }
+- (void)setLabels:(NSArray *)labels { }
+- (void)clearLabels { }
+
+- (NSArray *)telecomsAddresses { return nil; }
+- (void)addTelecomsAddress:(XMPPvCardTel *)tel { }
+- (void)removeTelecomsAddress:(XMPPvCardTel *)tel { }
+- (void)setTelecomsAddresses:(NSArray *)tels { }
+- (void)clearTelecomsAddresses { }
+
+- (NSArray *)emailAddresses { return nil; }
+- (void)addEmailAddress:(XMPPvCardEmail *)email { }
+- (void)removeEmailAddress:(XMPPvCardEmail *)email { }
+- (void)setEmailAddresses:(NSArray *)emails { }
+- (void)clearEmailAddresses { }
+
+- (XMPPJID *)jid {
+	XMPPJID *jid = nil;
+	NSXMLElement *elem = [self elementForName:@"JABBERID"];
+	
+	if (elem != nil) {
+		jid = [XMPPJID jidWithString:[elem stringValue]];
+	}
+	
+	return jid;
+}
+- (void)setJid:(XMPPJID *)jid {
+	NSXMLElement *elem = [self elementForName:@"JABBERID"];
+	
+	if (elem == nil && jid != nil) {
+		elem = [NSXMLElement elementWithName:@"JABBERID"];
+		[self addChild:elem];
+	}
+	
+	if (jid != nil) {
+		[elem setStringValue:[jid full]];
+	} else if (elem != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+	}
+}
+
+- (NSString *)mailer {
+	return [[self elementForName:@"MAILER"] stringValue];
+}
+- (void)setMailer:(NSString *)mailer {
+	XMPP_VCARD_SET_STRING_CHILD(mailer, @"MAILER");
+}
+
+#pragma mark Geographical Types
+
+- (NSTimeZone *)timeZone {
+	// Turns out this is hard. Being lazy for now (not like anyone actually uses this, right?)
+	NSXMLElement *tz = [self elementForName:@"TZ"];
+	if (tz != nil) {
+		// This is unlikely to work. :-(
+		return [NSTimeZone timeZoneWithName:[tz stringValue]];
+	} else {
+		return nil;
+	}
+}
+- (void)setTimeZone:(NSTimeZone *)tz {
+	NSXMLElement *elem = [self elementForName:@"TZ"];
+
+	if (elem == nil && tz != nil) {
+		elem = [NSXMLElement elementWithName:@"TZ"];
+		[self addChild:elem];
+	}
+	
+	if (tz != nil) {
+		NSInteger offset = [tz secondsFromGMT];
+		[elem setStringValue:[NSString stringWithFormat:@"%02d:%02d", offset / 3600, (offset % 3600) / 60]];
+	} else if (elem != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+	}
+}
+
+- (CLLocation *)location {
+	CLLocation *loc = nil;
+	NSXMLElement *geo = [self elementForName:@"GEO"];
+	
+	if (geo != nil) {
+		NSXMLElement *lat = [geo elementForName:@"LAT"];
+		NSXMLElement *lon = [geo elementForName:@"LON"];
+		
+		loc = [[[CLLocation alloc] initWithLatitude:[[lat stringValue] doubleValue] longitude:[[lon stringValue] doubleValue]] autorelease];
+	}
+	
+	return loc;
+}
+- (void)setLocation:(CLLocation *)geo {
+	NSXMLElement *elem = [self elementForName:@"GEO"];
+	NSXMLElement *lat;
+	NSXMLElement *lon;
+	
+	if (geo != nil) {
+		CLLocationCoordinate2D coord = [geo coordinate];
+		if (elem == nil) {
+			elem = [NSXMLElement elementWithName:@"GEO"];
+			[self addChild:elem];
+		
+			lat = [NSXMLElement elementWithName:@"LAT"];
+			[elem addChild:lat];
+			lon = [NSXMLElement elementWithName:@"LON"];
+			[elem addChild:lon];
+		} else {
+			lat = [elem elementForName:@"LAT"];
+			lon = [elem elementForName:@"LON"];
+		}
+
+		[lat setStringValue:[NSString stringWithFormat:@"%.6f", coord.latitude]];
+		[lon setStringValue:[NSString stringWithFormat:@"%.6f", coord.longitude]];
+	} else if (elem != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+	}
+}
+
+#pragma mark Organizational Types
+
+- (NSString *)title {
+	return [[self elementForName:@"TITLE"] stringValue];
+}
+- (void)setTitle:(NSString *)title {
+	XMPP_VCARD_SET_STRING_CHILD(title, @"TITLE");
+}
+
+- (NSString *)role {
+	return [[self elementForName:@"ROLE"] stringValue];
+}
+- (void)setRole:(NSString *)role {
+	XMPP_VCARD_SET_STRING_CHILD(role, @"ROLE");
+}
+
+- (NSData *)logo {
+	NSData *decodedData = nil;
+	NSXMLElement *logo = [self elementForName:@"LOGO"];
+	
+	if (logo != nil) {
+		// There is a LOGO element. It should have a TYPE and a BINVAL
+		//NSXMLElement *fileType = [photo elementForName:@"TYPE"];
+		NSXMLElement *binval = [logo elementForName:@"BINVAL"];
+		
+		if (binval) {
+			NSData *base64Data = [[binval stringValue] dataUsingEncoding:NSASCIIStringEncoding];
+			decodedData = [base64Data base64Decoded];
+		}
+	}
+	
+	return decodedData;
+}
+- (void)setLogo:(NSData *)data {
+	NSXMLElement *logo = [self elementForName:@"LOGO"];
+	
+	if (logo == nil) {
+		logo = [NSXMLElement elementWithName:@"LOGO"];
+		[self addChild:logo];
+	}
+	
+	NSXMLElement *binval = [logo elementForName:@"BINVAL"];
+	
+	if (binval == nil) {
+		binval = [NSXMLElement elementWithName:@"BINVAL"];
+		[logo addChild:binval];
+	}
+	
+	[binval setStringValue:[data base64Encoded]];
+}
+
+- (XMPPvCard *)agent {
+	XMPPvCard *agent = nil;
+	NSXMLElement *elem = [self elementForName:@"AGENT"];
+	
+	if (elem != nil) {
+		agent = [XMPPvCard vCardFromElement:elem];
+	}
+	
+	return agent;
+}
+- (void)setAgent:(XMPPvCard *)agent {
+	NSXMLElement *elem = [self elementForName:@"AGENT"];
+	
+	if (elem != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+	}
+	
+	if (agent != nil) {
+		[self addChild:agent];
+	}
+}
+
+- (NSString *)orgName {
+	NSString *result = nil;
+	NSXMLElement *org = [self elementForName:@"ORG"];
+	
+	if (org != nil) {
+		NSXMLElement *orgname = [org elementForName:@"ORGNAME"];
+		
+		if (orgname != nil) {
+			result = [orgname stringValue];
+		}
+	}
+	
+	return result;
+}
+- (void)setOrgName:(NSString *)orgname {
+	NSXMLElement *org = [self elementForName:@"ORG"];
+	NSXMLElement *elem = nil;
+
+	if (orgname != nil) {
+		if (org == nil) {
+			org = [NSXMLElement elementWithName:@"ORG"];
+			[self addChild:org];
+		} else {
+			elem = [org elementForName:@"ORGNAME"];
+		}
+		
+		if (elem == nil) {
+			elem = [NSXMLElement elementWithName:@"ORGNAME"];
+			[org addChild:elem];
+		}
+		
+		[elem setStringValue:orgname];
+	} else if (org != nil) {
+		// This implicitly removes all orgunits too, as per the spec
+		[self removeChildAtIndex:[[self children] indexOfObject:org]];
+	}
+}
+
+- (NSArray *)orgUnits {
+	NSArray *result = nil;
+	NSXMLElement *org = [self elementForName:@"ORG"];
+	
+	if (org != nil) {
+		NSArray *elems = [org elementsForName:@"ORGUNIT"];
+		NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:[elems count]];
+		
+		for (NSXMLElement *elem in elems) {
+			[arr addObject:[elem stringValue]];
+		}
+		
+		result = [NSArray arrayWithArray:arr];
+		[arr release];
+	}
+	
+	return result;
+}
+- (void)setOrgUnits:(NSArray *)orgunits {
+	NSXMLElement *org = [self elementForName:@"ORG"];
+	
+	// If there is no org, then there is nothing to do (need ORGNAME first)
+	if (org != nil) {
+		NSArray *elems = [org elementsForName:@"ORGUNIT"];
+		for (NSXMLElement *elem in elems) {
+			[org removeChildAtIndex:[[org children] indexOfObject:elem]];
+		}
+		
+		for (NSString *unit in orgunits) {
+			NSXMLElement *elem = [NSXMLElement elementWithName:@"ORGUNIT"];
+			[elem setStringValue:unit];
+			
+			[org addChild:elem];
+		}
+	}
+}
+
+#pragma mark Explanatory Types
+
+- (NSArray *)categories {
+	NSArray *result = nil;
+	NSXMLElement *categories = [self elementForName:@"CATEGORIES"];
+	
+	if (categories != nil) {
+		NSArray *elems = [categories elementsForName:@"KEYWORD"];
+		NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:[elems count]];
+		
+		for (NSXMLElement *elem in elems) {
+			[arr addObject:[elem stringValue]];
+		}
+		
+		result = [NSArray arrayWithArray:arr];
+		[arr release];
+	}
+	
+	return result;
+}
+- (void)setCategories:(NSArray *)categories {
+	NSXMLElement *cat = [self elementForName:@"CATEGORIES"];
+	
+	if (categories != nil) {
+		if (cat == nil) {
+			cat = [NSXMLElement elementWithName:@"CATEGORIES"];
+			[self addChild:cat];
+		}
+		
+		NSArray *elems = [cat elementsForName:@"KEYWORD"];
+		for (NSXMLElement *elem in elems) {
+			[cat removeChildAtIndex:[[cat children] indexOfObject:elem]];
+		}
+		
+		for (NSString *kw in categories) {
+			NSXMLElement *elem = [NSXMLElement elementWithName:@"KEYWORD"];
+			[elem setStringValue:kw];
+			
+			[cat addChild:elem];
+		}
+	} else if (cat != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:cat]];
+	}
+}
+
+- (NSString *)note {
+	return [[self elementForName:@"NOTE"] stringValue];
+}
+- (void)setNote:(NSString *)note {
+	XMPP_VCARD_SET_STRING_CHILD(note, @"NOTE");
+}
+
+- (NSString *)prodid {
+	return [[self elementForName:@"PRODID"] stringValue];
+}
+- (void)setProdid:(NSString *)prodid {
+	XMPP_VCARD_SET_STRING_CHILD(prodid, @"PRODID");
+}
+
+- (NSDate *)revision {
+	NSDate *rev = nil;
+	NSXMLElement *elem = [self elementForName:@"REV"];
+	
+	if (elem != nil) {
+		rev = [NSDate dateWithXmppDateTimeString:[elem stringValue]];
+	}
+	
+	return rev;
+}
+- (void)setRevision:(NSDate *)rev {
+	NSXMLElement *elem = [self elementForName:@"REV"];
+	
+	if (elem == nil) {
+		elem = [NSXMLElement elementWithName:@"REV"];
+		[self addChild:elem];
+	}
+	
+	[elem setStringValue:[rev xmppDateTimeString]];
+}
+
+- (NSString *)sortString {
+	return [[self elementForName:@"SORT-STRING"] stringValue];
+}
+- (void)setSortString:(NSString *)sortString {
+	XMPP_VCARD_SET_STRING_CHILD(sortString, @"SORT-STRING");
+}
+
+- (NSString *)phoneticSound {
+	NSString *phon = nil;
+	NSXMLElement *sound = [self elementForName:@"SOUND"];
+	
+	if (sound != nil) {
+		NSXMLElement *elem = [sound elementForName:@"PHONETIC"];
+		
+		if (elem != nil) {
+			phon = [elem stringValue];
+		}
+	}
+	
+	return phon;
+}
+- (void)setPhoneticSound:(NSString *)phonetic {
+	NSXMLElement *sound = [self elementForName:@"SOUND"];
+	NSXMLElement *elem;
+	
+	if (sound == nil && phonetic != nil) {
+		sound = [NSXMLElement elementWithName:@"SOUND"];
+		[self addChild:sound];
+	}
+	
+	if (sound != nil) {
+		elem = [sound elementForName:@"PHONETIC"];
+		
+		if (elem != nil && phonetic != nil) {
+			elem = [NSXMLElement elementWithName:@"PHONETIC"];
+			[sound addChild:elem];
+		}
+	}
+	
+	if (phonetic != nil) {
+		[elem setStringValue:phonetic];
+	} else if (sound != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:phonetic]];
+	}
+}
+
+- (NSData *)sound {
+	NSData *decodedData = nil;
+	NSXMLElement *sound = [self elementForName:@"SOUND"];
+	
+	if (sound != nil) {
+		NSXMLElement *binval = [sound elementForName:@"BINVAL"];
+		
+		if (binval) {
+			NSData *base64Data = [[binval stringValue] dataUsingEncoding:NSASCIIStringEncoding];
+			decodedData = [base64Data base64Decoded];
+		}
+	}
+	
+	return decodedData;
+}
+- (void)setSound:(NSData *)data {
+	NSXMLElement *sound = [self elementForName:@"SOUND"];
+	
+	if (sound == nil) {
+		sound = [NSXMLElement elementWithName:@"SOUND"];
+		[self addChild:sound];
+	}
+	
+	NSXMLElement *binval = [sound elementForName:@"BINVAL"];
+	
+	if (binval == nil) {
+		binval = [NSXMLElement elementWithName:@"BINVAL"];
+		[sound addChild:binval];
+	}
+	
+	[binval setStringValue:[data base64Encoded]];
+}
+
+- (NSString *)uid {
+	return [[self elementForName:@"UID"] stringValue];
+}
+- (void)setUid:(NSString *)uid {
+	XMPP_VCARD_SET_STRING_CHILD(uid, @"UID");
+}
+
+- (NSString *)url {
+	return [[self elementForName:@"URL"] stringValue];
+}
+- (void)setUrl:(NSString *)url {
+	XMPP_VCARD_SET_STRING_CHILD(url, @"URL");
+}
+
+- (NSString *)version {
+	return [self attributeStringValueForName:@"version"];
+}
+- (void)setVersion:(NSString *)version {
+	[self addAttributeWithName:@"version" stringValue:version];
+}
+
+- (NSString *)description {
+	return [[self elementForName:@"DESC"] stringValue];
+}
+- (void)setDescription:(NSString *)desc {
+	XMPP_VCARD_SET_STRING_CHILD(desc, @"DESC");
+}
+
+#pragma mark Security Types
+
+- (XMPPvCardClass)privacyClass {
+	XMPPvCardClass priv = XMPPvCardClassNone;
+	NSXMLElement *elem = [self elementForName:@"CLASS"];
+	
+	if (elem != nil) {
+		if ([elem elementForName:@"PUBLIC"] != nil) {
+			priv = XMPPvCardClassPublic;
+		} else if ([elem elementForName:@"PRIVATE"] != nil) {
+			priv = XMPPvCardClassPrivate;
+		} else if ([elem elementForName:@"CONFIDENTIAL"] != nil) {
+			priv = XMPPvCardClassConfidential;
+		}
+	}
+	
+	return priv;
+}
+- (void)setPrivacyClass:(XMPPvCardClass)privacyClass {
+	NSXMLElement *elem = [self elementForName:@"CLASS"];
+
+	if (elem == nil && privacyClass != XMPPvCardClassNone) {
+		elem = [NSXMLElement elementWithName:@"CLASS"];
+	}
+	
+	if (elem != nil) {
+		for (NSString *cls in [NSArray arrayWithObjects:@"PUBLIC", @"PRIVATE", @"CONFIDENTIAL", nil]) {
+			NSXMLElement *priv = [elem elementForName:cls];
+			if (priv != nil) {
+				[elem removeChildAtIndex:[[elem children] indexOfObject:priv]];
+			}
+		}
+		
+		switch (privacyClass) {
+			case XMPPvCardClassPublic:
+				[elem addChild:[NSXMLElement elementWithName:@"PUBLIC"]];
+				break;
+			case XMPPvCardClassPrivate:
+				[elem addChild:[NSXMLElement elementWithName:@"PRIVATE"]];
+				break;
+			case XMPPvCardClassConfidential:
+				[elem addChild:[NSXMLElement elementWithName:@"CONFIDENTIAL"]];
+				break;
+			default:
+			case XMPPvCardClassNone:
+				// Remove the whole element
+				[self removeChildAtIndex:[[self children] indexOfObject:elem]];
+				break;
+		}
+	}
+}
+
+- (NSData *)key { return nil; }
+- (void)setKey:(NSData *)key { }
+
+- (NSString *)keyType {
+	NSString *typ = nil;
+	NSXMLElement *key = [self elementForName:@"KEY"];
+	
+	if (key != nil) {
+		NSXMLElement *elem = [key elementForName:@"TYPE"];
+		
+		if (elem != nil) {
+			typ = [elem stringValue];
+		}
+	}
+	
+	return typ;
+}
+- (void)setKeyType:(NSString *)type {
+	NSXMLElement *key = [self elementForName:@"KEY"];
+	NSXMLElement *elem;
+	
+	if (key == nil && type != nil) {
+		key = [NSXMLElement elementWithName:@"KEY"];
+		[self addChild:key];
+	}
+	
+	if (key != nil) {
+		elem = [key elementForName:@"TYPE"];
+		
+		if (elem != nil && type != nil) {
+			elem = [NSXMLElement elementWithName:@"TYPE"];
+			[key addChild:elem];
+		}
+	}
+	
+	if (type != nil) {
+		[elem setStringValue:type];
+	} else if (key != nil) {
+		[self removeChildAtIndex:[[self children] indexOfObject:key]];
+	}
+}
+
+@end
+