LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: fc9d10c123885769669adb2eef1fa95420c32ff6 

Monotone-Revision: 6e9bce1000589aa89ad5a242618e33803b931ca2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-02T20:06:53
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-04-02 20:06:53 +00:00
parent ad372b07aa
commit 973fe8eb87
8 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OGoContentStore/OCSContactFieldExtractor.m
View File

@ -42,7 +42,7 @@ static NSString *fieldNames[] = {
nil, nil
};
- (NSMutableDictionary *) extractQuickFieldsFromVCard: (NGVCard *) _vCard
- (NSMutableDictionary *) extractQuickFieldsFromVCard: (NGVCard *) vCard
{
NSMutableDictionary *fields;
NSArray *values;
@ -50,15 +50,15 @@ static NSString *fieldNames[] = {
NSString *value;
unsigned int max;
if (_vCard == nil)
if (vCard == nil)
return nil;
fields = [NSMutableDictionary dictionaryWithCapacity:16];
value = [_vCard fn];
value = [vCard fn];
if (value)
[fields setObject: value forKey: @"cn"];
values = [_vCard n];
values = [vCard n];
if (values)
{
max = [values count];
@ -70,26 +70,25 @@ static NSString *fieldNames[] = {
forKey: @"givenName"];
}
}
value = [_vCard preferredTel];
value = [vCard preferredTel];
if (value)
[fields setObject: value forKey: @"telephoneNumber"];
value = [_vCard preferredEMail];
value = [vCard preferredEMail];
if (value)
[fields setObject: value forKey: @"mail"];
values = [_vCard org];
if (values)
values = [vCard org];
max = [values count];
if (max > 0)
{
max = [values count];
if (max > 0)
{
[fields setObject: [values objectAtIndex: 0] forKey: @"o"];
if (max > 1)
[fields setObject: [values objectAtIndex: 1] forKey: @"ou"];
}
[fields setObject: [values objectAtIndex: 0] forKey: @"o"];
if (max > 1)
[fields setObject: [values objectAtIndex: 1] forKey: @"ou"];
}
adr = [_vCard preferredAdr];
adr = [vCard preferredAdr];
if (adr)
[fields setObject: [adr value: 3] forKey: @"l"];
value = [[vCard uniqueChildWithTag: @"X-AIM"] value: 0];
[fields setObject: value forKey: @"screenname"];
return fields;
}

5
OGoContentStore/contact.ocs
View File

@ -24,6 +24,11 @@
sqlType = "VARCHAR(256)";
allowsNull = YES;
},
{
columnName = screenname;
sqlType = "VARCHAR(256)";
allowsNull = YES;
},
{
columnName = l;
sqlType = "VARCHAR(256)";

1
OGoContentStore/sql/generate-folderinfo-sql-for-users.sh
View File

@ -110,6 +110,7 @@ CREATE TABLE SOGo_${USER_TABLE}_contacts_quick (
givenname VARCHAR(256),
cn VARCHAR(256),
sn VARCHAR(256),
screenname VARCHAR(256),
l VARCHAR(256),
mail VARCHAR(256),
o VARCHAR(256),

6
SoObjects/Contacts/SOGoContactGCSFolder.m
View File

@ -27,8 +27,8 @@
#import "SOGoContactGCSFolder.h"
#define folderListingFields [NSArray arrayWithObjects: @"c_name", @"cn", \
@"sn", @"givenname", @"l", \
@"mail", @"telephonenumber", \
@"givenname", @"screenname", \
@"o", @"mail", @"telephonenumber", \
nil]
@implementation SOGoContactGCSFolder
@ -155,7 +155,7 @@
fields = folderListingFields;
qualifier = [self _qualifierForFilter: filter];
records = [[self ocsFolder] fetchFields: fields
matchingQualifier: qualifier];
matchingQualifier: qualifier];
if (records)
{
ordering

1
SoObjects/Contacts/SOGoContactLDAPFolder.m
View File

@ -45,6 +45,7 @@
#define folderListingFields [NSArray arrayWithObjects: @"c_name", @"cn", \
@"displayName", \
@"streetAddress", \
@"o", \
@"sn", @"givenname", @"l", \
@"mail", @"telephonenumber", \
@"mailNickname", \

5
UI/Contacts/UIxContactEditor.m
View File

@ -454,6 +454,7 @@
- (void) _saveSnapshot
{
CardElement *element;
NSArray *units;
[card setNWithFamily: [snapshot objectForKey: @"sn"]
given: [snapshot objectForKey: @"givenName"]
@ -485,6 +486,10 @@
value: [snapshot objectForKey: @"calFBURL"]];
[card setUniqueChild: element];
units = [NSArray arrayWithObject: [snapshot objectForKey: @"workService"]];
[card setOrg: [snapshot objectForKey: @"workCompany"]
units: units];
[self _savePhoneValues];
[self _saveEmails];
[[card uniqueChildWithTag: @"x-aim"]

21
UI/Templates/ContactsUI/UIxContactsListView.wox
View File

@ -15,7 +15,7 @@
<!-- localize -->
<td class="tbtv_headercell">
<var:component className="UIxSortableTableHeader"
label:label="Lastname"
label:label="Name"
const:sortKey="cn"
const:href="view"
var:queryDictionary="context.request.formValues"
@ -23,17 +23,20 @@
</td>
<td class="tbtv_headercell">
<var:component className="UIxSortableTableHeader"
label:label="EMail"
label:label="Email"
const:sortKey="mail"
const:href="view"
var:queryDictionary="context.request.formValues"
/>
</td>
<td class="tbtv_headercell">
<var:string label:value="Phone" />
<var:string label:value="Screen Name" />
</td>
<td class="tbtv_headercell">
<var:string label:value="Location" />
<var:string label:value="Organization" />
</td>
<td class="tbtv_headercell">
<var:string label:value="Work Phone" />
</td>
</tr>
@ -45,10 +48,12 @@
onclick="return onContactRowClick(event, this);"
ondblclick="return onContactRowDblClick(event, this);"
oncontextmenu="return onContactContextMenu(event, this);">
<td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="displayName" const:escapeHTML="YES" /></td>
<td onmousedown="return false;"><var:string value="currentContact.mail" /></td>
<td onmousedown="return false;"><var:string value="currentContact.telephonenumber" /></td>
<td onmousedown="return false;"><var:string value="currentContact.l" /></td>
<td onmousedown="return false;"><img rsrc:src="abcard.gif"
/><var:string value="displayName" const:escapeHTML="YES" /></td>
<td onmousedown="return false;"><var:string value="currentContact.mail"/></td>
<td onmousedown="return false;"><var:string value="currentContact.screenname"/></td>
<td onmousedown="return false;"><var:string value="currentContact.o"/></td>
<td onmousedown="return false;"><var:string value="currentContact.telephonenumber"/></td>
</tr>
</var:foreach>
</tbody>

2
UI/WebServerResources/ContactsUI.js
View File

@ -377,7 +377,7 @@ function onFolderSelectionChange() {
function onSearchFormSubmit() {
var searchValue = $("searchValue");
openContactsFolder(URLForFolderID(currentContactFolder),
openContactsFolder(currentContactFolder,
"search=" + searchValue.value);
return false;