diff options
author | Jakob Sack <kde@jakobsack.de> | 2011-09-17 00:26:57 +0200 |
---|---|---|
committer | Jakob Sack <kde@jakobsack.de> | 2011-09-17 00:26:57 +0200 |
commit | 54a3b28dce8ed0185d504e9c16d068a852d8a7b3 (patch) | |
tree | 75515cc758aad46a1a680a763f76c169b6b51897 /apps/contacts/ajax/showsetproperty.php | |
parent | 2a84f7f07c58b92b5c2293e0936fd3aec9e8f616 (diff) | |
download | nextcloud-server-54a3b28dce8ed0185d504e9c16d068a852d8a7b3.tar.gz nextcloud-server-54a3b28dce8ed0185d504e9c16d068a852d8a7b3.zip |
Split OC_Contacts_Addressbook in _Addressbook and _VCard
Diffstat (limited to 'apps/contacts/ajax/showsetproperty.php')
-rw-r--r-- | apps/contacts/ajax/showsetproperty.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/contacts/ajax/showsetproperty.php b/apps/contacts/ajax/showsetproperty.php index 722ee8d9e35..51187d505bc 100644 --- a/apps/contacts/ajax/showsetproperty.php +++ b/apps/contacts/ajax/showsetproperty.php @@ -33,19 +33,19 @@ if( !OC_User::isLoggedIn()){ exit(); } -$card = OC_Contacts_Addressbook::findCard( $id ); +$card = OC_Contacts_VCard::find( $id ); if( $card === false ){ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!')))); exit(); } -$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] ); +$addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] ); if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!')))); exit(); } -$vcard = OC_Contacts_Addressbook::parse($card['carddata']); +$vcard = OC_Contacts_VCard::parse($card['carddata']); // Check if the card is valid if(is_null($vcard)){ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!')))); @@ -67,7 +67,7 @@ if(is_null($line)){ $tmpl = new OC_Template('contacts','part.setpropertyform'); $tmpl->assign('id',$id); $tmpl->assign('checksum',$checksum); -$tmpl->assign('property',OC_Contacts_Addressbook::structureProperty($vcard->children[$line])); +$tmpl->assign('property',OC_Contacts_VCard::structureProperty($vcard->children[$line])); $page = $tmpl->fetchPage(); echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page ))); |