diff options
author | Bart Visscher <bartv@thisnet.nl> | 2011-09-23 22:22:59 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2011-09-25 22:19:28 +0200 |
commit | 17e631bc5e327514596ce8761fe7f93d414a8717 (patch) | |
tree | a2e6bed923a493988028adafaaebcab5b9bfbd39 /settings/ajax/togglegroups.php | |
parent | dbddec9160338818009ec7020cec5a2b298aae7e (diff) | |
download | nextcloud-server-17e631bc5e327514596ce8761fe7f93d414a8717.tar.gz nextcloud-server-17e631bc5e327514596ce8761fe7f93d414a8717.zip |
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.
Diffstat (limited to 'settings/ajax/togglegroups.php')
-rw-r--r-- | settings/ajax/togglegroups.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 3210252af02..3ee3239dd89 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -3,14 +3,7 @@ // Init owncloud require_once('../../lib/base.php'); -// We send json data -header( "Content-Type: application/jsonrequest" ); - -// Check if we are a user -if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); - exit(); -} +OC_JSON::checkAdminUser(); $success = true; $error = "add user to"; @@ -39,10 +32,10 @@ else{ // Return Success story if( $success ){ - echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "action" => $action, "groupname" => $group ))); + OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group ))); } else{ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to $error group $group" ))); + OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" ))); } ?> |