addressbook: detect contact folder items via server flag

Contact folder items (from personal and shared folders) lack the
Contact Provider GUID in their entry ID, so the existing detection
in isPersonalContact() and isPersonalDistList() missed them. This
caused contacts and distribution lists from contact folders to be
unrecognizable and unopenable from the addressbook dialog.

Add an is_contact_item flag to the server response for all contact
folder items and check it in both detection methods as a fallback
when the entry ID has no Contact Provider GUID.

Author: grammmike

client/zarafa/addressbook/AddressBookRecord.js

@@ -56,6 +56,7 @@ Zarafa.addressbook.AddressBookRecordFields = [
 	{name: 'comment'},
 	{name: 'icon_index'},
 	{name: 'is_shared'},
+	{name: 'is_contact_item'},
 ];
 
 Zarafa.core.data.RecordFactory.addFieldToObjectType(Zarafa.core.mapi.ObjectType.MAPI_MAILUSER, Zarafa.addressbook.AddressBookRecordFields);
@@ -205,8 +206,16 @@ Zarafa.addressbook.AddressBookRecord = Ext.extend(Zarafa.core.data.MAPIRecord, {
 	{
 		if(Zarafa.core.MessageClass.isClass(this.get('message_class'), 'IPM.CONTACT', true)){
 			return true;
-		}else if (this.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_MAILUSER && Zarafa.core.EntryId.hasContactProviderGUID(this.get('entryid'))){
-			return true;
+		}
+		if (this.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_MAILUSER) {
+			if (Zarafa.core.EntryId.hasContactProviderGUID(this.get('entryid'))) {
+				return true;
+			}
+			// Contact folder items have the is_contact_item flag set
+			// by the server (both personal and shared contact folders).
+			if (this.get('is_contact_item')) {
+				return true;
+			}
 		}
 		return false;
 	},
@@ -222,8 +231,16 @@ Zarafa.addressbook.AddressBookRecord = Ext.extend(Zarafa.core.data.MAPIRecord, {
 	{
 		if(Zarafa.core.MessageClass.isClass(this.get('message_class'), 'IPM.DISTLIST', true)){
 			return true;
-		}else if (this.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_DISTLIST && Zarafa.core.EntryId.hasContactProviderGUID(this.get('entryid'))){
-			return true;
+		}
+		if (this.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_DISTLIST) {
+			if (Zarafa.core.EntryId.hasContactProviderGUID(this.get('entryid'))) {
+				return true;
+			}
+			// Contact folder items have the is_contact_item flag set
+			// by the server (both personal and shared contact folders).
+			if (this.get('is_contact_item')) {
+				return true;
+			}
 		}
 		return false;
 	},

server/includes/modules/class.addressbooklistmodule.php

@@ -194,6 +194,7 @@ public function GABUsers($action, $actionType) {
 						// These are real contact items from a MAPI folder, not
 						// AB entries, so they use contact properties instead of
 						// AB list properties.
+						$item['is_contact_item'] = true;
 
 						// Do not display private items from shared folders
 						if ($isSharedFolder && isset($user_data[$this->properties['private']]) && $user_data[$this->properties['private']] === true) {