mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-21 06:33:18 +00:00
propagate from branch 'ca.inverse.sogo.1_3_12' (head 05f8b72feb6a6c81f20462457e2dbc6c47ae9edc)
to branch 'ca.inverse.sogo' (head dc4e3d958b052eb7529db6b61731e80df56ed412) Monotone-Parent: 05f8b72feb6a6c81f20462457e2dbc6c47ae9edc Monotone-Parent: dc4e3d958b052eb7529db6b61731e80df56ed412 Monotone-Revision: ba1ab7317c5e8c4b1e95d7e3f299bfd9ea38b10d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-02-01T21:12:25 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
@@ -52,6 +52,8 @@
|
||||
|
||||
categories = [[self categories] mutableCopy];
|
||||
[categories autorelease];
|
||||
if (!categories)
|
||||
categories = [NSMutableArray array];
|
||||
if (set)
|
||||
{
|
||||
if (![categories containsObject: category])
|
||||
|
||||
@@ -27,22 +27,18 @@
|
||||
@class NSString;
|
||||
@class NSMutableDictionary;
|
||||
|
||||
@class NGVCard;
|
||||
|
||||
@class SOGoContactFolder;
|
||||
|
||||
@interface UIxContactEditor : UIxComponent
|
||||
{
|
||||
id addressBookItem;
|
||||
NSString *preferredEmail;
|
||||
NSString *item;
|
||||
NGVCard *card;
|
||||
NSMutableArray *photosURL;
|
||||
NSMutableDictionary *snapshot; /* contains the values for editing */
|
||||
NSMutableDictionary *ldifRecord; /* contains the values for editing */
|
||||
SOGoContactFolder *componentAddressBook;
|
||||
NSArray *contactCategories;
|
||||
}
|
||||
|
||||
- (NSMutableDictionary *) ldifRecord;
|
||||
|
||||
- (void) setAddressBookItem: (id) _item;
|
||||
- (id) addressBookItem;
|
||||
|
||||
|
||||
+93
-559
@@ -34,8 +34,6 @@
|
||||
#import <NGExtensions/NSNull+misc.h>
|
||||
|
||||
#import <NGCards/NGVCard.h>
|
||||
#import <NGCards/NGVCardPhoto.h>
|
||||
#import <NGCards/NSArray+NGCards.h>
|
||||
|
||||
#import <SOGo/NSArray+Utilities.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
@@ -50,20 +48,23 @@
|
||||
|
||||
#import "UIxContactEditor.h"
|
||||
|
||||
static Class SOGoContactGCSEntryK = Nil;
|
||||
|
||||
@implementation UIxContactEditor
|
||||
|
||||
+ (void) initialize
|
||||
{
|
||||
SOGoContactGCSEntryK = [SOGoContactGCSEntry class];
|
||||
}
|
||||
|
||||
- (id) init
|
||||
{
|
||||
if ((self = [super init]))
|
||||
{
|
||||
snapshot = [[NSMutableDictionary alloc] initWithCapacity: 16];
|
||||
preferredEmail = nil;
|
||||
photosURL = nil;
|
||||
ldifRecord = nil;
|
||||
addressBookItem = nil;
|
||||
item = nil;
|
||||
card = nil;
|
||||
componentAddressBook = nil;
|
||||
contactCategories = nil;
|
||||
}
|
||||
|
||||
return self;
|
||||
@@ -71,18 +72,35 @@
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[snapshot release];
|
||||
[preferredEmail release];
|
||||
[photosURL release];
|
||||
[ldifRecord release];
|
||||
[addressBookItem release];
|
||||
[item release];
|
||||
[componentAddressBook release];
|
||||
[contactCategories release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
/* accessors */
|
||||
|
||||
- (NSMutableDictionary *) ldifRecord
|
||||
{
|
||||
NSDictionary *clientLDIFRecord;
|
||||
NSString *queryValue;
|
||||
|
||||
if (!ldifRecord)
|
||||
{
|
||||
clientLDIFRecord = [[self clientObject] ldifRecord];
|
||||
ldifRecord = [clientLDIFRecord mutableCopy];
|
||||
queryValue = [self queryParameterForKey: @"contactEmail"];
|
||||
if ([queryValue length] > 0)
|
||||
[ldifRecord setObject: queryValue forKey: @"mail"];
|
||||
queryValue = [self queryParameterForKey: @"contactFN"];
|
||||
if ([queryValue length] > 0)
|
||||
[ldifRecord setObject: queryValue forKey: @"displayname"];
|
||||
}
|
||||
|
||||
return ldifRecord;
|
||||
}
|
||||
|
||||
- (void) setAddressBookItem: (id) _item
|
||||
{
|
||||
ASSIGN (addressBookItem, _item);
|
||||
@@ -130,27 +148,6 @@
|
||||
|
||||
/* load/store content format */
|
||||
|
||||
// - (void) _fixupSnapshot
|
||||
// {
|
||||
// NSString *currentKey, *currentString;
|
||||
// NSMutableString *newString;
|
||||
// NSArray *keys;
|
||||
// unsigned int count, max;
|
||||
|
||||
// keys = [snapshot allKeys];
|
||||
// max = [keys count];
|
||||
// for (count = 0; count < max; count++)
|
||||
// {
|
||||
// currentKey = [keys objectAtIndex: count];
|
||||
// currentString = [snapshot objectForKey: currentKey];
|
||||
// newString = [currentString mutableCopy];
|
||||
// [newString autorelease];
|
||||
// [newString replaceString: @";" withString: @"\\;"];
|
||||
// if (![newString isEqualToString: currentString])
|
||||
// [snapshot setObject: newString forKey: currentKey];
|
||||
// }
|
||||
// }
|
||||
|
||||
/* helper */
|
||||
|
||||
- (NSString *) _completeURIForMethod: (NSString *) _method
|
||||
@@ -179,12 +176,7 @@
|
||||
|
||||
- (BOOL) isNew
|
||||
{
|
||||
id co;
|
||||
|
||||
co = [self clientObject];
|
||||
|
||||
return ([co isKindOfClass: [SOGoContentObject class]]
|
||||
&& [co isNew]);
|
||||
return ([[self clientObject] isNew]);
|
||||
}
|
||||
|
||||
- (NSArray *) addressBooksList
|
||||
@@ -205,14 +197,13 @@
|
||||
while (currentFolder)
|
||||
{
|
||||
if ([currentFolder isEqual: folder] ||
|
||||
([currentFolder isKindOfClass: [SOGoContactGCSFolder class]] &&
|
||||
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
||||
onObject: currentFolder
|
||||
inContext: context]))
|
||||
![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
||||
onObject: currentFolder
|
||||
inContext: context])
|
||||
[addressBooksList addObject: currentFolder];
|
||||
currentFolder = [folders nextObject];
|
||||
}
|
||||
|
||||
|
||||
return addressBooksList;
|
||||
}
|
||||
|
||||
@@ -245,26 +236,30 @@
|
||||
return fDisplayName;
|
||||
}
|
||||
|
||||
- (void) setContactCategories: (NSString *) jsonCategories
|
||||
- (BOOL) supportCategories
|
||||
{
|
||||
return [[self clientObject] isKindOfClass: SOGoContactGCSEntryK];
|
||||
}
|
||||
|
||||
- (void) setJsonContactCategories: (NSString *) jsonCategories
|
||||
{
|
||||
NSArray *newCategories;
|
||||
|
||||
newCategories = [jsonCategories objectFromJSONString];
|
||||
if ([newCategories isKindOfClass: [NSArray class]])
|
||||
ASSIGN (contactCategories, newCategories);
|
||||
[[self ldifRecord] setObject: newCategories
|
||||
forKey: @"vcardcategories"];
|
||||
else
|
||||
[[self ldifRecord] removeObjectForKey: @"vcardcategories"];
|
||||
}
|
||||
|
||||
- (NSString *) contactCategories
|
||||
- (NSString *) jsonContactCategories
|
||||
{
|
||||
NSString *jsonCats;
|
||||
NSArray *categories;
|
||||
|
||||
if (!contactCategories)
|
||||
ASSIGN (contactCategories, [card categories]);
|
||||
jsonCats = [contactCategories jsonRepresentation];
|
||||
if (!jsonCats)
|
||||
jsonCats = @"[]";
|
||||
categories = [[self ldifRecord] objectForKey: @"vcardcategories"];
|
||||
|
||||
return jsonCats;
|
||||
return [categories jsonRepresentation];
|
||||
}
|
||||
|
||||
- (NSArray *) _languageContactsCategories
|
||||
@@ -279,11 +274,11 @@
|
||||
return [categoryLabels trimmedComponents];
|
||||
}
|
||||
|
||||
- (NSArray *) _fetchAndCombineCategoriesList: (NSArray *) contactCats
|
||||
- (NSArray *) _fetchAndCombineCategoriesList
|
||||
{
|
||||
NSString *ownerLogin;
|
||||
SOGoUserDefaults *ud;
|
||||
NSArray *cats, *newCats;
|
||||
NSArray *cats, *newCats, *contactCategories;
|
||||
|
||||
ownerLogin = [[self clientObject] ownerInContext: context];
|
||||
ud = [[SOGoUser userWithLogin: ownerLogin] userDefaults];
|
||||
@@ -291,9 +286,10 @@
|
||||
if (!cats)
|
||||
cats = [self _languageContactsCategories];
|
||||
|
||||
if (contactCats)
|
||||
contactCategories = [[self ldifRecord] objectForKey: @"vcardcategories"];
|
||||
if (contactCategories)
|
||||
{
|
||||
newCats = [cats mergedArrayWithArray: contactCats];
|
||||
newCats = [cats mergedArrayWithArray: contactCategories];
|
||||
if ([newCats count] != [cats count])
|
||||
{
|
||||
cats = [newCats sortedArrayUsingSelector:
|
||||
@@ -311,7 +307,7 @@
|
||||
NSArray *cats;
|
||||
NSString *list;
|
||||
|
||||
cats = [self _fetchAndCombineCategoriesList: [card categories]];
|
||||
cats = [self _fetchAndCombineCategoriesList];
|
||||
list = [cats jsonRepresentation];
|
||||
if (!list)
|
||||
list = @"[]";
|
||||
@@ -328,311 +324,7 @@
|
||||
|
||||
actionName = [[request requestHandlerPath] lastPathComponent];
|
||||
|
||||
return ([[self clientObject] isKindOfClass: [SOGoContactGCSEntry class]]
|
||||
&& [actionName hasPrefix: @"save"]);
|
||||
}
|
||||
|
||||
- (void) _setSnapshotValue: (NSString *) key
|
||||
to: (NSString *) aValue
|
||||
{
|
||||
if (!aValue)
|
||||
aValue = @"";
|
||||
|
||||
[snapshot setObject: aValue forKey: key];
|
||||
}
|
||||
|
||||
- (NSMutableDictionary *) snapshot
|
||||
{
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
- (NSString *) _simpleValueForType: (NSString *) aType
|
||||
inArray: (NSArray *) anArray
|
||||
excluding: (NSString *) aTypeToExclude
|
||||
{
|
||||
NSArray *elements;
|
||||
NSString *value;
|
||||
|
||||
elements = [anArray cardElementsWithAttribute: @"type"
|
||||
havingValue: aType];
|
||||
|
||||
value = nil;
|
||||
|
||||
if ([elements count] > 0)
|
||||
{
|
||||
CardElement *ce;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < [elements count]; i++)
|
||||
{
|
||||
ce = [elements objectAtIndex: i];
|
||||
value = [ce flattenedValuesForKey: @""];
|
||||
|
||||
if (!aTypeToExclude)
|
||||
break;
|
||||
|
||||
if (![ce hasAttribute: @"type" havingValue: aTypeToExclude])
|
||||
break;
|
||||
|
||||
value = nil;
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
- (void) _setupEmailFields
|
||||
{
|
||||
NSArray *elements;
|
||||
NSString *workMail, *homeMail, *prefMail, *potential;
|
||||
unsigned int max;
|
||||
|
||||
elements = [card childrenWithTag: @"email"];
|
||||
max = [elements count];
|
||||
workMail = [self _simpleValueForType: @"work"
|
||||
inArray: elements excluding: nil];
|
||||
homeMail = [self _simpleValueForType: @"home"
|
||||
inArray: elements excluding: nil];
|
||||
prefMail = [self _simpleValueForType: @"pref"
|
||||
inArray: elements excluding: nil];
|
||||
|
||||
if (max > 0)
|
||||
{
|
||||
potential = [[elements objectAtIndex: 0] flattenedValuesForKey: @""];
|
||||
if (!workMail)
|
||||
{
|
||||
if (homeMail && homeMail == potential)
|
||||
{
|
||||
if (max > 1)
|
||||
workMail = [[elements objectAtIndex: 1] flattenedValuesForKey: @""];
|
||||
}
|
||||
else
|
||||
workMail = potential;
|
||||
}
|
||||
if (!homeMail && max > 1)
|
||||
{
|
||||
if (workMail && workMail == potential)
|
||||
homeMail = [[elements objectAtIndex: 1] flattenedValuesForKey: @""];
|
||||
else
|
||||
homeMail = potential;
|
||||
}
|
||||
|
||||
if (prefMail)
|
||||
{
|
||||
if (prefMail == workMail)
|
||||
preferredEmail = @"work";
|
||||
else if (prefMail == homeMail)
|
||||
preferredEmail = @"home";
|
||||
}
|
||||
}
|
||||
|
||||
[self _setSnapshotValue: @"workMail" to: workMail];
|
||||
[self _setSnapshotValue: @"homeMail" to: homeMail];
|
||||
|
||||
[self _setSnapshotValue: @"mozillaUseHtmlMail"
|
||||
to: [[card uniqueChildWithTag: @"x-mozilla-html"] flattenedValuesForKey: @""]];
|
||||
}
|
||||
|
||||
- (void) _setupOrgFields
|
||||
{
|
||||
NSMutableArray *orgServices;
|
||||
CardElement *org;
|
||||
NSString *service;
|
||||
NSUInteger count, max;
|
||||
|
||||
org = [card org];
|
||||
[self _setSnapshotValue: @"workCompany"
|
||||
to: [org flattenedValueAtIndex: 0 forKey: @""]];
|
||||
max = [[org valuesForKey: @""] count];
|
||||
if (max > 1)
|
||||
{
|
||||
orgServices = [NSMutableArray arrayWithCapacity: max];
|
||||
for (count = 1; count < max; count++)
|
||||
{
|
||||
service = [org flattenedValueAtIndex: count forKey: @""];
|
||||
if ([service length] > 0)
|
||||
[orgServices addObject: service];
|
||||
}
|
||||
|
||||
[self _setSnapshotValue: @"workService"
|
||||
to: [orgServices componentsJoinedByString: @", "]];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *) preferredEmail
|
||||
{
|
||||
return preferredEmail;
|
||||
}
|
||||
|
||||
- (void) setPreferredEmail: (NSString *) aString
|
||||
{
|
||||
preferredEmail = aString;
|
||||
}
|
||||
|
||||
- (void) _retrieveQueryParameter: (NSString *) queryKey
|
||||
intoSnapshotValue: (NSString *) snapshotKey
|
||||
{
|
||||
NSString *queryValue;
|
||||
|
||||
queryValue = [self queryParameterForKey: queryKey];
|
||||
if (queryValue && [queryValue length] > 0)
|
||||
[self _setSnapshotValue: snapshotKey to: queryValue];
|
||||
}
|
||||
|
||||
- (void) initSnapshot
|
||||
{
|
||||
NSArray *elements;
|
||||
CardElement *element;
|
||||
|
||||
element = [card n];
|
||||
[self _setSnapshotValue: @"sn"
|
||||
to: [element flattenedValueAtIndex: 0 forKey: @""]];
|
||||
[self _setSnapshotValue: @"givenName"
|
||||
to: [element flattenedValueAtIndex: 1 forKey: @""]];
|
||||
[self _setSnapshotValue: @"fn" to: [card fn]];
|
||||
[self _setSnapshotValue: @"nickname" to: [card nickname]];
|
||||
|
||||
elements = [card childrenWithTag: @"tel"];
|
||||
// We do this (exclude FAX) in order to avoid setting the WORK number as the FAX
|
||||
// one if we do see the FAX field BEFORE the WORK number.
|
||||
[self _setSnapshotValue: @"telephoneNumber"
|
||||
to: [self _simpleValueForType: @"work" inArray: elements excluding: @"fax"]];
|
||||
[self _setSnapshotValue: @"homeTelephoneNumber"
|
||||
to: [self _simpleValueForType: @"home" inArray: elements excluding: @"fax"]];
|
||||
[self _setSnapshotValue: @"mobile"
|
||||
to: [self _simpleValueForType: @"cell" inArray: elements excluding: nil]];
|
||||
[self _setSnapshotValue: @"facsimileTelephoneNumber"
|
||||
to: [self _simpleValueForType: @"fax" inArray: elements excluding: nil]];
|
||||
[self _setSnapshotValue: @"pager"
|
||||
to: [self _simpleValueForType: @"pager" inArray: elements excluding: nil]];
|
||||
|
||||
// If we don't have a "home" and "work" phone number but
|
||||
// we have a "voice" one defined, we set it to the "work" value
|
||||
// This can happen when we have :
|
||||
// VERSION:2.1
|
||||
// N:name;surname;;;;
|
||||
// TEL;VOICE;HOME:
|
||||
// TEL;VOICE;WORK:
|
||||
// TEL;PAGER:
|
||||
// TEL;FAX;WORK:
|
||||
// TEL;CELL:514 123 1234
|
||||
// TEL;VOICE:450 456 6789
|
||||
// ADR;HOME:;;;;;;
|
||||
// ADR;WORK:;;;;;;
|
||||
// ADR:;;;;;;
|
||||
if ([[snapshot objectForKey: @"telephoneNumber"] length] == 0 &&
|
||||
[[snapshot objectForKey: @"homeTelephoneNumber"] length] == 0 &&
|
||||
[elements count] > 0)
|
||||
{
|
||||
[self _setSnapshotValue: @"telephoneNumber"
|
||||
to: [self _simpleValueForType: @"voice" inArray: elements excluding: nil]];
|
||||
}
|
||||
|
||||
[self _setupEmailFields];
|
||||
|
||||
[self _setSnapshotValue: @"screenName"
|
||||
to: [[card uniqueChildWithTag: @"x-aim"] flattenedValuesForKey: @""]];
|
||||
|
||||
elements = [card childrenWithTag: @"adr"
|
||||
andAttribute: @"type" havingValue: @"work"];
|
||||
if (elements && [elements count] > 0)
|
||||
{
|
||||
element = [elements objectAtIndex: 0];
|
||||
[self _setSnapshotValue: @"workExtendedAddress"
|
||||
to: [element flattenedValueAtIndex: 1 forKey: @""]];
|
||||
[self _setSnapshotValue: @"workStreetAddress"
|
||||
to: [element flattenedValueAtIndex: 2 forKey: @""]];
|
||||
[self _setSnapshotValue: @"workCity"
|
||||
to: [element flattenedValueAtIndex: 3 forKey: @""]];
|
||||
[self _setSnapshotValue: @"workState"
|
||||
to: [element flattenedValueAtIndex: 4 forKey: @""]];
|
||||
[self _setSnapshotValue: @"workPostalCode"
|
||||
to: [element flattenedValueAtIndex: 5 forKey: @""]];
|
||||
[self _setSnapshotValue: @"workCountry"
|
||||
to: [element flattenedValueAtIndex: 6 forKey: @""]];
|
||||
}
|
||||
|
||||
elements = [card childrenWithTag: @"adr"
|
||||
andAttribute: @"type" havingValue: @"home"];
|
||||
if (elements && [elements count] > 0)
|
||||
{
|
||||
element = [elements objectAtIndex: 0];
|
||||
[self _setSnapshotValue: @"homeExtendedAddress"
|
||||
to: [element flattenedValueAtIndex: 1 forKey: @""]];
|
||||
[self _setSnapshotValue: @"homeStreetAddress"
|
||||
to: [element flattenedValueAtIndex: 2 forKey: @""]];
|
||||
[self _setSnapshotValue: @"homeCity"
|
||||
to: [element flattenedValueAtIndex: 3 forKey: @""]];
|
||||
[self _setSnapshotValue: @"homeState"
|
||||
to: [element flattenedValueAtIndex: 4 forKey: @""]];
|
||||
[self _setSnapshotValue: @"homePostalCode"
|
||||
to: [element flattenedValueAtIndex: 5 forKey: @""]];
|
||||
[self _setSnapshotValue: @"homeCountry"
|
||||
to: [element flattenedValueAtIndex: 6 forKey: @""]];
|
||||
}
|
||||
|
||||
elements = [card childrenWithTag: @"url"];
|
||||
[self _setSnapshotValue: @"workURL"
|
||||
to: [self _simpleValueForType: @"work" inArray: elements excluding: nil]];
|
||||
[self _setSnapshotValue: @"homeURL"
|
||||
to: [self _simpleValueForType: @"home" inArray: elements excluding: nil]];
|
||||
|
||||
// If we don't have a "work" or "home" URL but we still have
|
||||
// an URL field present, let's add it to the "home" value
|
||||
if ([[snapshot objectForKey: @"workURL"] length] == 0 &&
|
||||
[[snapshot objectForKey: @"homeURL"] length] == 0 &&
|
||||
[elements count] > 0)
|
||||
{
|
||||
[self _setSnapshotValue: @"homeURL"
|
||||
to: [[elements objectAtIndex: 0] flattenedValuesForKey: @""]];
|
||||
}
|
||||
// If we do have a "work" URL but no "home" URL but two
|
||||
// values URLs present, let's add the second one as the home URL
|
||||
else if ([[snapshot objectForKey: @"workURL"] length] > 0 &&
|
||||
[[snapshot objectForKey: @"homeURL"] length] == 0 &&
|
||||
[elements count] > 1)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < [elements count]; i++)
|
||||
{
|
||||
if ([[[elements objectAtIndex: i] flattenedValuesForKey: @""]
|
||||
caseInsensitiveCompare: [snapshot objectForKey: @"workURL"]] != NSOrderedSame)
|
||||
{
|
||||
[self _setSnapshotValue: @"homeURL"
|
||||
to: [[elements objectAtIndex: i] flattenedValuesForKey: @""]];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[self _setSnapshotValue: @"calFBURL"
|
||||
to: [[card uniqueChildWithTag: @"FBURL"] flattenedValuesForKey: @""]];
|
||||
|
||||
[self _setSnapshotValue: @"title" to: [card title]];
|
||||
[self _setupOrgFields];
|
||||
|
||||
[self _setSnapshotValue: @"bday" to: [card bday]];
|
||||
[self _setSnapshotValue: @"tz" to: [card tz]];
|
||||
[self _setSnapshotValue: @"note" to: [card note]];
|
||||
|
||||
[self _retrieveQueryParameter: @"contactEmail"
|
||||
intoSnapshotValue: @"workMail"];
|
||||
[self _retrieveQueryParameter: @"contactFN"
|
||||
intoSnapshotValue: @"fn"];
|
||||
}
|
||||
|
||||
- (id <WOActionResults>) defaultAction
|
||||
{
|
||||
card = [[self clientObject] vCard];
|
||||
if (card)
|
||||
[self initSnapshot];
|
||||
else
|
||||
return [NSException exceptionWithHTTPStatus:404 /* Not Found */
|
||||
reason: @"could not open contact"];
|
||||
|
||||
return self;
|
||||
return ([actionName hasPrefix: @"save"]);
|
||||
}
|
||||
|
||||
- (NSString *) viewActionName
|
||||
@@ -647,216 +339,60 @@
|
||||
return @"editAsContact";
|
||||
}
|
||||
|
||||
- (BOOL) canCreateOrModify
|
||||
- (BOOL) supportPhotos
|
||||
{
|
||||
SOGoObject *co;
|
||||
|
||||
co = [self clientObject];
|
||||
|
||||
return ([co isKindOfClass: [SOGoContentObject class]]
|
||||
&& [super canCreateOrModify]);
|
||||
return [[self clientObject] isKindOfClass: SOGoContactGCSEntryK];
|
||||
}
|
||||
|
||||
- (NSArray *) photosURL
|
||||
- (BOOL) hasPhoto
|
||||
{
|
||||
return [[self clientObject] hasPhoto];
|
||||
}
|
||||
|
||||
- (NSString *) photoURL
|
||||
{
|
||||
NSArray *photoElements;
|
||||
NSURL *soURL;
|
||||
NSString *baseInlineURL, *photoURL;
|
||||
NGVCardPhoto *photo;
|
||||
int count, max;
|
||||
|
||||
if (!photosURL)
|
||||
{
|
||||
soURL = [[self clientObject] soURL];
|
||||
baseInlineURL = [soURL absoluteString];
|
||||
photoElements = [card childrenWithTag: @"photo"];
|
||||
max = [photoElements count];
|
||||
photosURL = [[NSMutableArray alloc] initWithCapacity: max];
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
photo = [photoElements objectAtIndex: count];
|
||||
if ([photo isInline])
|
||||
photoURL = [NSString stringWithFormat: @"%@/photo%d",
|
||||
baseInlineURL, count];
|
||||
else
|
||||
photoURL = [photo flattenedValuesForKey: @""];
|
||||
[photosURL addObject: photoURL];
|
||||
}
|
||||
}
|
||||
soURL = [[self clientObject] soURL];
|
||||
|
||||
return photosURL;
|
||||
}
|
||||
|
||||
- (CardElement *) _elementWithTag: (NSString *) tag
|
||||
ofType: (NSString *) type
|
||||
{
|
||||
NSArray *elements;
|
||||
CardElement *element;
|
||||
|
||||
elements = [card childrenWithTag: tag
|
||||
andAttribute: @"type" havingValue: type];
|
||||
if ([elements count] > 0)
|
||||
element = [elements objectAtIndex: 0];
|
||||
else
|
||||
{
|
||||
element = [CardElement new];
|
||||
[element autorelease];
|
||||
[element setTag: tag];
|
||||
[element addType: type];
|
||||
[card addChild: element];
|
||||
}
|
||||
|
||||
return element;
|
||||
}
|
||||
|
||||
- (void) _savePhoneValues
|
||||
{
|
||||
CardElement *phone;
|
||||
|
||||
phone = [self _elementWithTag: @"tel" ofType: @"work"];
|
||||
[phone setSingleValue: [snapshot objectForKey: @"telephoneNumber"] forKey: @""];
|
||||
phone = [self _elementWithTag: @"tel" ofType: @"home"];
|
||||
[phone setSingleValue: [snapshot objectForKey: @"homeTelephoneNumber"] forKey: @""];
|
||||
phone = [self _elementWithTag: @"tel" ofType: @"cell"];
|
||||
[phone setSingleValue: [snapshot objectForKey: @"mobile"] forKey: @""];
|
||||
phone = [self _elementWithTag: @"tel" ofType: @"fax"];
|
||||
[phone setSingleValue: [snapshot objectForKey: @"facsimileTelephoneNumber"]
|
||||
forKey: @""];
|
||||
phone = [self _elementWithTag: @"tel" ofType: @"pager"];
|
||||
[phone setSingleValue: [snapshot objectForKey: @"pager"] forKey: @""];
|
||||
}
|
||||
|
||||
- (void) _saveEmails
|
||||
{
|
||||
CardElement *workMail, *homeMail;
|
||||
|
||||
workMail = [self _elementWithTag: @"email" ofType: @"work"];
|
||||
[workMail setSingleValue: [snapshot objectForKey: @"workMail"] forKey: @""];
|
||||
homeMail = [self _elementWithTag: @"email" ofType: @"home"];
|
||||
[homeMail setSingleValue: [snapshot objectForKey: @"homeMail"] forKey: @""];
|
||||
if (preferredEmail)
|
||||
{
|
||||
if ([preferredEmail isEqualToString: @"work"])
|
||||
[card setPreferred: workMail];
|
||||
else
|
||||
[card setPreferred: homeMail];
|
||||
}
|
||||
|
||||
[[card uniqueChildWithTag: @"x-mozilla-html"]
|
||||
setSingleValue: [snapshot objectForKey: @"mozillaUseHtmlMail"]
|
||||
forKey: @""];
|
||||
}
|
||||
|
||||
- (void) _saveSnapshot
|
||||
{
|
||||
CardElement *element;
|
||||
NSArray *units;
|
||||
|
||||
[card setNWithFamily: [snapshot objectForKey: @"sn"]
|
||||
given: [snapshot objectForKey: @"givenName"]
|
||||
additional: nil
|
||||
prefixes: nil
|
||||
suffixes: nil];
|
||||
[card setNickname: [snapshot objectForKey: @"nickname"]];
|
||||
[card setFn: [snapshot objectForKey: @"fn"]];
|
||||
[card setTitle: [snapshot objectForKey: @"title"]];
|
||||
[card setBday: [snapshot objectForKey: @"bday"]];
|
||||
[card setNote: [snapshot objectForKey: @"note"]];
|
||||
[card setTz: [snapshot objectForKey: @"tz"]];
|
||||
|
||||
element = [self _elementWithTag: @"adr" ofType: @"home"];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homeExtendedAddress"]
|
||||
atIndex: 1 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homeStreetAddress"]
|
||||
atIndex: 2 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homeCity"]
|
||||
atIndex: 3 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homeState"]
|
||||
atIndex: 4 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homePostalCode"]
|
||||
atIndex: 5 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"homeCountry"]
|
||||
atIndex: 6 forKey: @""];
|
||||
|
||||
element = [self _elementWithTag: @"adr" ofType: @"work"];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workExtendedAddress"]
|
||||
atIndex: 1 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workStreetAddress"]
|
||||
atIndex: 2 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workCity"]
|
||||
atIndex: 3 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workState"]
|
||||
atIndex: 4 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workPostalCode"]
|
||||
atIndex: 5 forKey: @""];
|
||||
[element setSingleValue: [snapshot objectForKey: @"workCountry"]
|
||||
atIndex: 6 forKey: @""];
|
||||
|
||||
element = [CardElement simpleElementWithTag: @"fburl"
|
||||
value: [snapshot objectForKey: @"calFBURL"]];
|
||||
[card setUniqueChild: element];
|
||||
|
||||
units = [NSArray arrayWithObject: [snapshot objectForKey: @"workService"]];
|
||||
[card setOrg: [snapshot objectForKey: @"workCompany"]
|
||||
units: units];
|
||||
|
||||
[self _savePhoneValues];
|
||||
[self _saveEmails];
|
||||
[[self _elementWithTag: @"url" ofType: @"home"]
|
||||
setSingleValue: [snapshot objectForKey: @"homeURL"] forKey: @""];
|
||||
[[self _elementWithTag: @"url" ofType: @"work"]
|
||||
setSingleValue: [snapshot objectForKey: @"workURL"] forKey: @""];
|
||||
|
||||
[[card uniqueChildWithTag: @"x-aim"]
|
||||
setSingleValue: [snapshot objectForKey: @"screenName"]
|
||||
forKey: @""];
|
||||
return [NSString stringWithFormat: @"%@/photo", [soURL absoluteString]];
|
||||
}
|
||||
|
||||
- (id <WOActionResults>) saveAction
|
||||
{
|
||||
SOGoContactGCSEntry *contact;
|
||||
SOGoObject <SOGoContactObject> *contact;
|
||||
id result;
|
||||
NSString *jsRefreshMethod;
|
||||
SoSecurityManager *sm;
|
||||
|
||||
contact = [self clientObject];
|
||||
card = [contact vCard];
|
||||
if (card)
|
||||
{
|
||||
// [self _fixupSnapshot];
|
||||
[self _saveSnapshot];
|
||||
[card setCategories: contactCategories];
|
||||
[self _fetchAndCombineCategoriesList: contactCategories];
|
||||
[contact save];
|
||||
[contact setLDIFRecord: ldifRecord];
|
||||
[self _fetchAndCombineCategoriesList];
|
||||
[contact save];
|
||||
|
||||
if (componentAddressBook && componentAddressBook != [self componentAddressBook])
|
||||
{
|
||||
sm = [SoSecurityManager sharedSecurityManager];
|
||||
if (![sm validatePermission: SoPerm_DeleteObjects
|
||||
onObject: componentAddressBook
|
||||
inContext: context])
|
||||
{
|
||||
if (![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
||||
onObject: componentAddressBook
|
||||
inContext: context])
|
||||
[contact moveToFolder: (SOGoGCSFolder *)componentAddressBook]; // TODO: handle exception
|
||||
}
|
||||
}
|
||||
|
||||
if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
|
||||
result = [self redirectToLocation: [self modulePath]];
|
||||
else
|
||||
if (componentAddressBook && componentAddressBook != [self componentAddressBook])
|
||||
{
|
||||
sm = [SoSecurityManager sharedSecurityManager];
|
||||
if (![sm validatePermission: SoPerm_DeleteObjects
|
||||
onObject: componentAddressBook
|
||||
inContext: context])
|
||||
{
|
||||
jsRefreshMethod
|
||||
= [NSString stringWithFormat: @"refreshContacts(\"%@\")",
|
||||
[contact nameInContainer]];
|
||||
result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
|
||||
if (![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
|
||||
onObject: componentAddressBook
|
||||
inContext: context])
|
||||
[contact moveToFolder: (SOGoGCSFolder *)componentAddressBook]; // TODO: handle exception
|
||||
}
|
||||
}
|
||||
|
||||
if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
|
||||
result = [self redirectToLocation: [self modulePath]];
|
||||
else
|
||||
result = [NSException exceptionWithHTTPStatus: 400 /* Bad Request */
|
||||
reason: @"method cannot be invoked on "
|
||||
@"the specified object"];
|
||||
{
|
||||
jsRefreshMethod
|
||||
= [NSString stringWithFormat: @"refreshContacts(\"%@\")",
|
||||
[contact nameInContainer]];
|
||||
result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -866,17 +402,15 @@
|
||||
NSString *email, *cn, *url;
|
||||
NSMutableString *address;
|
||||
|
||||
card = [[self clientObject] vCard];
|
||||
[self initSnapshot];
|
||||
if ([preferredEmail isEqualToString: @"home"])
|
||||
email = [snapshot objectForKey: @"homeMail"];
|
||||
else
|
||||
email = [snapshot objectForKey: @"workMail"];
|
||||
[self ldifRecord];
|
||||
email = [ldifRecord objectForKey: @"mail"];
|
||||
if ([email length] == 0)
|
||||
email = [ldifRecord objectForKey: @"mozillasecondemail"];
|
||||
|
||||
if (email)
|
||||
{
|
||||
address = [NSMutableString string];
|
||||
cn = [card fn];
|
||||
cn = [ldifRecord objectForKey: @"cn"];
|
||||
if ([cn length] > 0)
|
||||
[address appendFormat: @"%@ <%@>", cn, email];
|
||||
else
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#import <Contacts/SOGoContactObject.h>
|
||||
#import <Contacts/SOGoContactFolder.h>
|
||||
#import <Contacts/SOGoContactFolders.h>
|
||||
#import <Contacts/NSDictionary+LDIF.h>
|
||||
|
||||
#import <SoObjects/Contacts/NGVCard+SOGo.h>
|
||||
#import <SoObjects/Contacts/NGVList+SOGo.h>
|
||||
@@ -76,9 +77,10 @@
|
||||
inContext: [self context]
|
||||
acquire: NO];
|
||||
if ([currentChild respondsToSelector: @selector (vCard)])
|
||||
[content appendFormat: [[currentChild vCard] ldifString]];
|
||||
[content appendFormat: [[currentChild ldifRecord] ldifRecordAsString]];
|
||||
else if ([currentChild respondsToSelector: @selector (vList)])
|
||||
[content appendFormat: [[currentChild vList] ldifString]];
|
||||
[content appendString: @"\n"];
|
||||
}
|
||||
|
||||
response = [context response];
|
||||
|
||||
@@ -52,8 +52,16 @@
|
||||
|
||||
#import "UIxContactFoldersView.h"
|
||||
|
||||
Class SOGoContactSourceFolderK, SOGoGCSFolderK;
|
||||
|
||||
@implementation UIxContactFoldersView
|
||||
|
||||
+ (void) initialize
|
||||
{
|
||||
SOGoContactSourceFolderK = [SOGoContactSourceFolder class];
|
||||
SOGoGCSFolderK = [SOGoGCSFolder class];
|
||||
}
|
||||
|
||||
- (id) init
|
||||
{
|
||||
if ((self = [super init]))
|
||||
@@ -110,11 +118,13 @@
|
||||
|
||||
folders = [self clientObject];
|
||||
folder = [folders lookupPersonalFolder: @"personal" ignoringRights: YES];
|
||||
|
||||
contactInfos = [folder lookupContactsWithFilter: nil
|
||||
onCriteria: nil
|
||||
sortBy: @"c_cn"
|
||||
ordering: NSOrderedAscending];
|
||||
if (folder && [folder conformsToProtocol: @protocol (SOGoContactFolder)])
|
||||
contactInfos = [folder lookupContactsWithFilter: nil
|
||||
onCriteria: nil
|
||||
sortBy: @"c_cn"
|
||||
ordering: NSOrderedAscending];
|
||||
else
|
||||
contactInfos = nil;
|
||||
|
||||
return contactInfos;
|
||||
}
|
||||
@@ -183,7 +193,7 @@
|
||||
{
|
||||
folder = [folders objectAtIndex: i];
|
||||
/* We first search in LDAP folders (in case of duplicated entries in GCS folders) */
|
||||
if ([folder isKindOfClass: [SOGoContactSourceFolder class]])
|
||||
if ([folder isKindOfClass: SOGoContactSourceFolderK])
|
||||
[sortedFolders insertObject: folder atIndex: 0];
|
||||
else
|
||||
[sortedFolders addObject: folder];
|
||||
@@ -287,10 +297,23 @@
|
||||
|
||||
- (NSString *) currentContactFolderClass
|
||||
{
|
||||
return ([currentFolder isKindOfClass: [SOGoContactSourceFolder class]]
|
||||
return (([currentFolder isKindOfClass: SOGoContactSourceFolderK]
|
||||
&& ![currentFolder isPersonalSource])
|
||||
? @"remote" : @"local");
|
||||
}
|
||||
|
||||
- (NSString *) currentContactFolderAclEditing
|
||||
{
|
||||
return ([currentFolder isKindOfClass: SOGoGCSFolderK]
|
||||
? @"available": @"unavailable");
|
||||
}
|
||||
|
||||
- (NSString *) currentContactFolderListEditing
|
||||
{
|
||||
return ([currentFolder isKindOfClass: SOGoGCSFolderK]
|
||||
? @"available": @"unavailable");
|
||||
}
|
||||
|
||||
- (NSString *) verticalDragHandleStyle
|
||||
{
|
||||
NSString *vertical;
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[card release];
|
||||
[photosURL release];
|
||||
[super dealloc];
|
||||
}
|
||||
@@ -377,9 +378,7 @@
|
||||
{
|
||||
NSString *data;
|
||||
|
||||
data = nil;
|
||||
|
||||
if (url)
|
||||
if ([url length] > 0)
|
||||
{
|
||||
if (![[url lowercaseString] rangeOfString: @"://"].length)
|
||||
url = [NSString stringWithFormat: @"http://%@", url];
|
||||
@@ -388,6 +387,8 @@
|
||||
@"<a href=\"%@\" target=\"_blank\">%@</a>",
|
||||
url, url];
|
||||
}
|
||||
else
|
||||
data = nil;
|
||||
|
||||
return [self _cardStringWithLabel: nil value: data];
|
||||
}
|
||||
@@ -646,30 +647,12 @@
|
||||
|
||||
/* action */
|
||||
|
||||
- (id <WOActionResults>) vcardAction
|
||||
{
|
||||
#warning this method is unused
|
||||
WOResponse *response;
|
||||
|
||||
card = [[self clientObject] vCard];
|
||||
if (card)
|
||||
{
|
||||
response = [context response];
|
||||
[response setHeader: @"text/vcard" forKey: @"Content-type"];
|
||||
[response appendContentString: [card versitString]];
|
||||
}
|
||||
else
|
||||
return [NSException exceptionWithHTTPStatus: 404 /* Not Found */
|
||||
reason:@"could not locate contact"];
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
- (id <WOActionResults>) defaultAction
|
||||
{
|
||||
card = [[self clientObject] vCard];
|
||||
if (card)
|
||||
{
|
||||
[card retain];
|
||||
phones = nil;
|
||||
homeAdr = nil;
|
||||
workAdr = nil;
|
||||
|
||||
@@ -139,6 +139,11 @@
|
||||
pageName = "UIxContactEditor";
|
||||
actionName = "new";
|
||||
};
|
||||
renameFolder = {
|
||||
protectedBy = "Change Permissions";
|
||||
actionClass = "UIxFolderActions";
|
||||
actionName = "renameFolder";
|
||||
};
|
||||
mailer-contacts = {
|
||||
protectedBy = "<public>";
|
||||
pageName = "UIxContactFoldersView";
|
||||
@@ -234,13 +239,27 @@
|
||||
SOGoContactLDIFEntry = {
|
||||
methods = {
|
||||
view = {
|
||||
protectedBy = "<public>";
|
||||
protectedBy = "Access Contents Information";
|
||||
pageName = "UIxContactView";
|
||||
};
|
||||
edit = {
|
||||
protectedBy = "<public>";
|
||||
protectedBy = "Access Contents Information";
|
||||
pageName = "UIxContactEditor";
|
||||
};
|
||||
editAsContact = {
|
||||
protectedBy = "Access Contents Information";
|
||||
pageName = "UIxContactEditor";
|
||||
};
|
||||
save = {
|
||||
protectedBy = "Change Images And Files";
|
||||
pageName = "UIxContactEditor";
|
||||
actionName = "save";
|
||||
};
|
||||
saveAsContact = {
|
||||
protectedBy = "Change Images And Files";
|
||||
pageName = "UIxContactEditor";
|
||||
actionName = "save";
|
||||
};
|
||||
write = {
|
||||
protectedBy = "<public>";
|
||||
pageName = "UIxContactEditor";
|
||||
|
||||
Reference in New Issue
Block a user