Use OC_JSON for json responses

Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.

1 files changed, 6 insertions, 10 deletions

diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 07cea0b53e1..40b765cf845 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -30,28 +30,24 @@ $checksum = $_GET['checksum'];
 $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
-if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
-	exit();
-}
-
+OC_JSON::checkLoggedIn();
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
+	OC_JSON::error(array('data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $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.'))));
+	OC_JSON::error(array('data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $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('vCard could not be read.'))));
+	OC_JSON::error(array('data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
@@ -62,11 +58,11 @@ for($i=0;$i<count($vcard->children);$i++){
 	}
 }
 if(is_null($line)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload the page.'))));
+	OC_JSON::error(array('data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
 unset($vcard->children[$line]);
 
 OC_Contacts_VCard::edit($id,$vcard->serialize());
-echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id )));
+OC_JSON::success(array('data' => array( 'id' => $id )));