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.

4 files changed, 5 insertions, 12 deletions

diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index d0d10f7a84e..cc15102bbc3 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -44,8 +44,6 @@ foreach( OC_Group::getGroups() as $i ){
         $groups[] = array( "groupname" => $i );
 }
 
-// We send json data
-header( "Content-Type: application/jsonrequest" );
-echo json_encode($groups);
+OC_JSON::encodedPrint($groups);
 
 ?>
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index adaf7dcb758..2e436f8d84e 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -26,9 +26,7 @@ require_once('../../lib/base.php');
 
 $app = $_POST["app"];
 
-// We send json data
-header( "Content-Type: application/jsonrequest" );
 $l = new OC_L10N( $app );
 
-echo json_encode( array( 'status' => 'success', 'data' => $l->getTranslations()));
+OC_JSON::success(array('data' => $l->getTranslations()));
 ?>
diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
index 0485f514550..c8168eaf460 100644
--- a/core/ajax/userlist.php
+++ b/core/ajax/userlist.php
@@ -43,8 +43,6 @@ foreach( OC_User::getUsers() as $i ){
        	$users[] = array( "username" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ));
 }
 
-// We send json data
-header( "Content-Type: application/jsonrequest" );
-echo json_encode($users);
+OC_JSON::encodedPrint($users);
 
 ?>
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
index 032948fc331..258bd50fcad 100644
--- a/core/ajax/validateuser.php
+++ b/core/ajax/validateuser.php
@@ -30,11 +30,10 @@ if(!isset($_SERVER['PHP_AUTH_USER'])){
         echo 'Valid credentials must be supplied';
         exit();
 } else {
-	header("Content-Type: application/jsonrequest");
         if(OC_User::checkPassword($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
-		echo json_encode(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "true"));
+		OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "true"));
 	} else {
-	        echo json_encode(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
+	        OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
 	}
 }